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

Made XPM writing code Unicode safe.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-11-09 21:43:23 +00:00
parent 759c8b5299
commit a14f68f247
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/common/imagxpm.cpp
View File

@@ -107,6 +107,19 @@ bool wxXPMHandler::LoadFile(wxImage *image,
return TRUE; return TRUE;
} }
static char hexArray[] = "0123456789ABCDEF";
static void DecToHex(int dec, char *buf)
{
int firstDigit = (int)(dec/16.0);
int secondDigit = (int)(dec - (firstDigit*16.0));
buf[0] = hexArray[firstDigit];
buf[1] = hexArray[secondDigit];
buf[2] = 0;
}
bool wxXPMHandler::SaveFile(wxImage * image, bool wxXPMHandler::SaveFile(wxImage * image,
wxOutputStream& stream, bool WXUNUSED(verbose)) wxOutputStream& stream, bool WXUNUSED(verbose))
{ {
@@ -140,7 +153,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
sName = wxString(wxT("/* XPM */\nstatic char *")) + sName; sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
else else
sName = wxT("/* XPM */\nstatic char *xpm_data"); sName = wxT("/* XPM */\nstatic char *xpm_data");
stream.Write(sName.c_str(), sName.Len()); stream.Write( (const char*) sName.ToAscii(), sName.Len() );
char tmpbuf[200]; char tmpbuf[200];
// VS: 200b is safe upper bound for anything produced by sprintf below // VS: 200b is safe upper bound for anything produced by sprintf below
@@ -185,19 +198,24 @@ bool wxXPMHandler::SaveFile(wxImage * image,
unsigned long key = entry->first; unsigned long key = entry->first;
if (key == 0) if (key == 0)
tmp.Printf(wxT("\"%s c Black\",\n"), sym); sprintf( tmpbuf, "\"%s c Black\",\n", sym);
else if (key == mask_key) else if (key == mask_key)
tmp.Printf(wxT("\"%s c None\",\n"), sym); sprintf( tmpbuf, "\"%s c None\",\n", sym);
else else
tmp.Printf(wxT("\"%s c #%s%s%s\",\n"), sym, {
wxDecToHex((unsigned char)(key >> 16)).c_str(), char rbuf[3];
wxDecToHex((unsigned char)(key >> 8)).c_str(), DecToHex( (unsigned char)(key >> 16), rbuf );
wxDecToHex((unsigned char)(key)).c_str()); char gbuf[3];
stream.Write(tmp.mb_str(), tmp.Length()); DecToHex( (unsigned char)(key >> 8), gbuf );
char bbuf[3];
DecToHex( (unsigned char)(key), bbuf );
sprintf( tmpbuf, "\"%s c #%s%s%s\",\n", sym, rbuf, gbuf, bbuf );
}
stream.Write( tmpbuf, strlen(tmpbuf) );
} }
tmp = wxT("/* pixels */\n"); tmp = wxT("/* pixels */\n");
stream.Write(tmp.mb_str(), tmp.Length()); stream.Write( (const char*) tmp.ToAscii(), tmp.Length() );
unsigned char *data = image->GetData(); unsigned char *data = image->GetData();
for (j = 0; j < image->GetHeight(); j++) for (j = 0; j < image->GetHeight(); j++)
@@ -216,7 +234,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
tmp_c = '\n'; stream.Write(&tmp_c, 1); tmp_c = '\n'; stream.Write(&tmp_c, 1);
} }
tmp = wxT("};\n"); tmp = wxT("};\n");
stream.Write(tmp.mb_str(), 3); stream.Write( (const char*) tmp.ToAscii(), 3 );
// Clean up: // Clean up:
delete[] symbols; delete[] symbols;