Huge streams checking and warning fixes.

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

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index cc45398eaf461c2025e9cafa1d663586016a5b77..03364b381e99bccf447ee41f7eadc01bc8bd0ec3 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -108,7 +108,7 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
         // If ((data & 0xC0) != 0xC0), then the value read is a data
         // byte. Else, it is a counter (cont = val & 0x3F) and the
         // next byte is the data byte.
         // If ((data & 0xC0) != 0xC0), then the value read is a data
         // byte. Else, it is a counter (cont = val & 0x3F) and the
         // next byte is the data byte.

-                 //
+

         if ((data & 0xC0) != 0xC0)
         {
             *(p++) = (unsigned char)data;
         if ((data & 0xC0) != 0xC0)
         {
             *(p++) = (unsigned char)data;


@@ -318,7 +318,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
     unsigned char *src;             // pointer into wxImage data
     unsigned int width, height;     // size of the image
     unsigned int bytesperline;      // bytes per line (each plane)
     unsigned char *src;             // pointer into wxImage data
     unsigned int width, height;     // size of the image
     unsigned int bytesperline;      // bytes per line (each plane)

-    int nplanes = 3;                // number of planes
+    unsigned char nplanes = 3;      // number of planes

     int format = wxPCX_24BIT;       // image format (8 bit, 24 bit)
     wxImageHistogram histogram;     // image histogram
     unsigned long key;              // key in the hashtable
     int format = wxPCX_24BIT;       // image format (8 bit, 24 bit)
     wxImageHistogram histogram;     // image histogram
     unsigned long key;              // key in the hashtable


@@ -416,7 +416,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
         memset(pal, 0, sizeof(pal));
 
         unsigned long index;
         memset(pal, 0, sizeof(pal));
 
         unsigned long index;

-        
+

         for (wxImageHistogram::iterator entry = histogram.begin();
              entry != histogram.end(); entry++ )
         {
         for (wxImageHistogram::iterator entry = histogram.begin();
              entry != histogram.end(); entry++ )
         {


@@ -447,7 +447,7 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
         if (verbose)
             wxLogError(_("PCX: this is not a PCX file."));
 
         if (verbose)
             wxLogError(_("PCX: this is not a PCX file."));
 

-        return FALSE;
+        return false;

     }
 
     image->Destroy();
     }
 
     image->Destroy();


@@ -465,10 +465,10 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             }
         }
         image->Destroy();
             }
         }
         image->Destroy();

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
 }
 
 bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )


@@ -495,7 +495,7 @@ bool wxPCXHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char c = stream.GetC();
     if ( !stream )
 {
     unsigned char c = stream.GetC();
     if ( !stream )

-        return FALSE;
+        return false;

 
     // not very safe, but this is all we can get from PCX header :-(
     return c == 10;
 
     // not very safe, but this is all we can get from PCX header :-(
     return c == 10;