X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..8482e4bdb9928fe9982ac214aee345b19894b39b:/src/common/imagxpm.cpp diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp index 59cae5bbe2..7da5a26011 100644 --- a/src/common/imagxpm.cpp +++ b/src/common/imagxpm.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik, Robert Roebling // RCS-ID: $Id$ // Copyright: (c) 2001 Vaclav Slavik -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /* @@ -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", @@ -240,7 +240,7 @@ bool wxXPMHandler::SaveFile(wxImage * image, delete[] symbols; delete[] symbols_data; - return TRUE; + return true; } bool wxXPMHandler::DoCanRead(wxInputStream& stream)