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

19
include/wx/utils.h
View File

@@ -252,6 +252,25 @@ WXDLLIMPEXP_BASE long wxNewId();
// Convert 2-digit hex number to decimal // Convert 2-digit hex number to decimal
WXDLLIMPEXP_BASE int wxHexToDec(const wxString& buf); WXDLLIMPEXP_BASE int wxHexToDec(const wxString& buf);
// Convert 2-digit hex number to decimal
inline int wxHexToDec(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 );
}
// Convert decimal integer to 2-character hex string // Convert decimal integer to 2-character hex string
WXDLLIMPEXP_BASE void wxDecToHex(int dec, wxChar *buf); WXDLLIMPEXP_BASE void wxDecToHex(int dec, wxChar *buf);
WXDLLIMPEXP_BASE void wxDecToHex(int dec, char* ch1, char* ch2); WXDLLIMPEXP_BASE void wxDecToHex(int dec, char* ch1, char* ch2);

19
src/common/utilscmn.cpp
View File

@@ -113,21 +113,12 @@
static const wxChar hexArray[] = wxT("0123456789ABCDEF"); static const wxChar hexArray[] = wxT("0123456789ABCDEF");
// Convert 2-digit hex number to decimal // Convert 2-digit hex number to decimal
int wxHexToDec(const wxString& buf) int wxHexToDec(const wxString& str)
{ {
int firstDigit, secondDigit; char buf[2];
buf[0] = str.GetChar(0);
if (buf.GetChar(0) >= wxT('A')) buf[1] = str.GetChar(1);
firstDigit = buf.GetChar(0) - wxT('A') + 10; return wxHexToDec((const char*) buf);
else
firstDigit = buf.GetChar(0) - wxT('0');
if (buf.GetChar(1) >= wxT('A'))
secondDigit = buf.GetChar(1) - wxT('A') + 10;
else
secondDigit = buf.GetChar(1) - wxT('0');
return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
} }
// Convert decimal integer to 2-character hex string // Convert decimal integer to 2-character hex string

20
src/richtext/richtextbuffer.cpp
View File

@@ -7621,24 +7621,6 @@ bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
return true; 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 // Read data in hex from a stream
bool wxRichTextImageBlock::ReadHex(wxInputStream& stream, int length, wxBitmapType imageType) 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[0] = (char)stream.GetC();
str[1] = (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; m_dataSize = dataSize;