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

Use common inline version of wxHexToDec

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2010-08-18 12:59:52 +00:00
parent b815cf68d2
commit a94656538f
3 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/richtext/richtextbuffer.cpp
View File

@@ -7621,24 +7621,6 @@ bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
return true;
}
inline int wxRichTextHexToDec(const char* buf)
{
int firstDigit, secondDigit;
if (buf[0] >= 'A')
firstDigit = buf[0] - 'A' + 10;
else
firstDigit = buf[0] - '0';
if (buf[1] >= 'A')
secondDigit = buf[1] - 'A' + 10;
else
secondDigit = buf[1] - '0';
return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
}
// Read data in hex from a stream
bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapType imageType)
{
@@ -7658,7 +7640,7 @@ bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapTy
str[0] = (char)stream.GetC();
str[1] = (char)stream.GetC();
m_data[i] = (unsigned char)wxRichTextHexToDec(str);
m_data[i] = (unsigned char)wxHexToDec(str);
}
m_dataSize = dataSize;