Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxDecToHex() to convert integer value to hex string

Browse Source
This commit is contained in:
Artur Wieczorek
2017-02-23 19:32:18 +01:00
parent 933e3e6fc5
commit bfa2b2896b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/generic/dcpsg.cpp
View File

@@ -963,9 +963,6 @@ void wxPostScriptDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
DoDrawBitmap( icon, x, y, true ); DoDrawBitmap( icon, x, y, true );
} }
/* this has to be char, not wxChar */
static const char hexArray[] = "0123456789ABCDEF";
void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) ) void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
{ {
wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
@@ -1006,7 +1003,6 @@ void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor
// size of the buffer = width*rgb(3)*hexa(2)+'\n' // size of the buffer = width*rgb(3)*hexa(2)+'\n'
wxCharBuffer charbuffer(w*6 + 1); wxCharBuffer charbuffer(w*6 + 1);
int firstDigit, secondDigit;
//rows //rows
for (int j = 0; j < h; j++) for (int j = 0; j < h; j++)
@@ -1016,10 +1012,10 @@ void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor
//cols //cols
for (int i = 0; i < w*3; i++) for (int i = 0; i < w*3; i++)
{ {
firstDigit = (int)(*data/16.0); char c1, c2;
secondDigit = (int)(*data - (firstDigit*16.0)); wxDecToHex(*data, &c1, &c2);
*(bufferindex++) = hexArray[firstDigit]; *(bufferindex++) = c1;
*(bufferindex++) = hexArray[secondDigit]; *(bufferindex++) = c2;
data++; data++;
} }