added wxUmaskChanger class and wxCHANGE_UMASK macro and use them instead of duplicati...

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

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 64a4d246b0efa5058f7aec2cfe7ed9524243ad88..14a3b0cff6424030c6efb168e58dacb55cf41b06 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "imagpcx.h"
 #endif
 
 #pragma implementation "imagpcx.h"
 #endif
 


@@ -21,9 +21,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 +36,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 +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;


@@ -407,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++ )
         {


@@ -429,8 +438,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 +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();


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


@@ -488,11 +495,13 @@ 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;
 }
 

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