1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 2e50e2c5a502ced4c829492350b2613d9e5709be..58eb0034c23a9e1efa5972abec42ece8ad6b93b0 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "imagpcx.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,9 +17,10 @@
 
 #ifndef WX_PRECOMP
 #  include "wx/defs.h"
 
 #ifndef WX_PRECOMP
 #  include "wx/defs.h"

+#  include "wx/palette.h"

 #endif
 
 #endif
 

-#if wxUSE_IMAGE && wxUSE_STREAMS && wxUSE_PCX
+#if wxUSE_IMAGE && wxUSE_PCX

 
 #include "wx/imagpcx.h"
 #include "wx/wfstream.h"
 
 #include "wx/imagpcx.h"
 #include "wx/wfstream.h"


@@ -35,6 +32,14 @@
 #include "wx/list.h"
 #include "wx/object.h"
 
 #include "wx/list.h"
 #include "wx/object.h"
 

+//-----------------------------------------------------------------------------
+// wxPCXHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+

 //-----------------------------------------------------------------------------
 // RLE encoding and decoding
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // RLE encoding and decoding
 //-----------------------------------------------------------------------------


@@ -99,7 +104,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;


@@ -309,7 +314,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


@@ -407,9 +412,9 @@ 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();
         for (wxImageHistogram::iterator entry = histogram.begin();

-             entry != histogram.end(); entry++ )
+             entry != histogram.end(); ++entry )

         {
             key = entry->first;
             index = entry->second.index;
         {
             key = entry->first;
             index = entry->second.index;


@@ -429,8 +434,6 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
 // wxPCXHandler
 //-----------------------------------------------------------------------------
 
 // wxPCXHandler
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
-

 bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
 {
     int error;
 bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
 {
     int error;


@@ -440,7 +443,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();


@@ -458,10 +461,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 )


@@ -486,14 +489,15 @@ bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
 
 bool wxPCXHandler::DoCanRead( wxInputStream& stream )
 {
 
 bool wxPCXHandler::DoCanRead( wxInputStream& stream )
 {

-    unsigned char c;
-
-    c = stream.GetC();
-    stream.SeekI(-1, wxFromCurrent);
+    unsigned char c = stream.GetC();
+    if ( !stream )
+        return false;

 
     // not very safe, but this is all we can get from PCX header :-(
 
     // not very safe, but this is all we can get from PCX header :-(

-    return (c == 10);
+    return c == 10;

 }
 
 }
 

-#endif // wxUSE_STREAMS && wxUSE_PCX
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_IMAGE && wxUSE_PCX