X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..768a499594fd9c9fd0155d0513c7f5b785ce4439:/src/common/imagxpm.cpp?ds=inline diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp index e0db84de12..5e8db820c9 100644 --- a/src/common/imagxpm.cpp +++ b/src/common/imagxpm.cpp @@ -102,9 +102,9 @@ bool wxXPMHandler::LoadFile(wxImage *image, wxImage img = decoder.ReadFile(stream); if ( !img.Ok() ) - return FALSE; + return false; *image = img; - return TRUE; + return true; } @@ -140,7 +140,7 @@ bool wxXPMHandler::SaveFile(wxImage * image, for ( k = MaxCixels; cols > k; k *= MaxCixels) chars_per_pixel++; - // 2. write the header: + // 2. write the header: wxString sName; if ( image->HasOption(wxIMAGE_OPTION_FILENAME) ) { @@ -148,17 +148,17 @@ bool wxXPMHandler::SaveFile(wxImage * image, NULL, &sName, NULL); sName << wxT("_xpm"); } - + if ( !sName.IsEmpty() ) sName = wxString(wxT("/* XPM */\nstatic char *")) + sName; - else + else sName = wxT("/* XPM */\nstatic char *xpm_data"); stream.Write( (const char*) sName.ToAscii(), sName.Len() ); char tmpbuf[200]; // VS: 200b is safe upper bound for anything produced by sprintf below // (<101 bytes the string, neither %i can expand into more than 10 chars) - sprintf(tmpbuf, + sprintf(tmpbuf, "[] = {\n" "/* columns rows colors chars-per-pixel */\n" "\"%i %i %i %i\",\n", @@ -180,7 +180,7 @@ bool wxXPMHandler::SaveFile(wxImage * image, // 2b. generate colour table: for (wxImageHistogram::iterator entry = histogram.begin(); - entry != histogram.end(); entry++ ) + entry != histogram.end(); ++entry ) { unsigned long index = entry->second.index; symbols[index] = symbols_data + index * (chars_per_pixel+1); @@ -240,7 +240,7 @@ bool wxXPMHandler::SaveFile(wxImage * image, delete[] symbols; delete[] symbols_data; - return TRUE; + return true; } bool wxXPMHandler::DoCanRead(wxInputStream& stream)