Change GetC to return an int so that it can return wxEOF on error.

[wxWidgets.git] / src / common / imagxpm.cpp

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 59cae5bbe22d41289a14459ab6f2a9c1ca27b0b7..3db566fcb741be9ef7a95f4ace6c5269a3e3d359 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagxpm.cpp
+// Name:        src/common/imagxpm.cpp
 // Purpose:     wxXPMHandler
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -62,28 +62,23 @@ license is as follows:
 %
 */
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagxpm.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#  pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_XPM
+
 #ifndef WX_PRECOMP
-#  include "wx/defs.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/utils.h"
 #endif
 
-#if wxUSE_XPM
-
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/utils.h"
 #include "wx/xpmdecod.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
@@ -102,9 +97,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 +135,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 +143,17 @@ bool wxXPMHandler::SaveFile(wxImage * image,
                     NULL, &sName, NULL);
         sName << wxT("_xpm");
     }
-    
-    if ( !sName.IsEmpty() )
+
+    if ( !sName.empty() )
         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 +175,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);
@@ -215,7 +210,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     }
 
     tmp = wxT("/* pixels */\n");
-    stream.Write( (const char*) tmp.ToAscii(), tmp.Length() );
+    stream.Write( (const char*) tmp.ToAscii(), tmp.length() );
 
     unsigned char *data = image->GetData();
     for (j = 0; j < image->GetHeight(); j++)
@@ -240,7 +235,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     delete[] symbols;
     delete[] symbols_data;
 
-    return TRUE;
+    return true;
 }
 
 bool wxXPMHandler::DoCanRead(wxInputStream& stream)