make sure gs_captureWindow is always set to NULL in DoReleaseMouse

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

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 348dd9f8f9e290b8c1532923582ab256a92dc5b9..17a9b54bd54037a0a8d35c0e81522a9ef4e6b352 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -23,7 +23,7 @@
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

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

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


@@ -102,7 +102,7 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
                  //
         if ((data & 0xC0) != 0xC0)
         {
                  //
         if ((data & 0xC0) != 0xC0)
         {

-            *(p++) = data;
+            *(p++) = (unsigned char)data;

             size--;
         }
         else
             size--;
         }
         else


@@ -110,7 +110,7 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
             cont = data & 0x3F;
             data = (unsigned char)s.GetC();
             for (i = 1; i <= cont; i++)
             cont = data & 0x3F;
             data = (unsigned char)s.GetC();
             for (i = 1; i <= cont; i++)

-                *(p++) = data;
+                *(p++) = (unsigned char)data;

             size -= cont;
         }
     }
             size -= cont;
         }
     }


@@ -277,9 +277,10 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
             *(p++) = pal[3 * index + 2];
         }
 
             *(p++) = pal[3 * index + 2];
         }
 

-        unsigned char* r = new unsigned char[256];
-        unsigned char* g = new unsigned char[256];
-        unsigned char* b = new unsigned char[256];
+#if wxUSE_PALETTE
+        unsigned char r[256];
+        unsigned char g[256];
+        unsigned char b[256];

         for (i = 0; i < 256; i++)
         {
             r[i] = pal[3*i + 0];
         for (i = 0; i < 256; i++)
         {
             r[i] = pal[3*i + 0];


@@ -287,7 +288,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
             b[i] = pal[3*i + 2];
         }
         image->SetPalette(wxPalette(256, r, g, b));
             b[i] = pal[3*i + 2];
         }
         image->SetPalette(wxPalette(256, r, g, b));

-        delete[] r; delete[] g; delete[] b;
+#endif // wxUSE_PALETTE

     }
 
     return wxPCX_OK;
     }
 
     return wxPCX_OK;


@@ -349,12 +350,12 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
     hdr[HDR_ENCODING]         = 1;
     hdr[HDR_NPLANES]          = nplanes;
     hdr[HDR_BITSPERPIXEL]     = 8;
     hdr[HDR_ENCODING]         = 1;
     hdr[HDR_NPLANES]          = nplanes;
     hdr[HDR_BITSPERPIXEL]     = 8;

-    hdr[HDR_BYTESPERLINE]     = bytesperline % 256;
-    hdr[HDR_BYTESPERLINE + 1] = bytesperline / 256;
-    hdr[HDR_XMAX]             = (width - 1)  % 256;
-    hdr[HDR_XMAX + 1]         = (width - 1)  / 256;
-    hdr[HDR_YMAX]             = (height - 1) % 256;
-    hdr[HDR_YMAX + 1]         = (height - 1) / 256;
+    hdr[HDR_BYTESPERLINE]     = (unsigned char)(bytesperline % 256);
+    hdr[HDR_BYTESPERLINE + 1] = (unsigned char)(bytesperline / 256);
+    hdr[HDR_XMAX]             = (unsigned char)((width - 1)  % 256);
+    hdr[HDR_XMAX + 1]         = (unsigned char)((width - 1)  / 256);
+    hdr[HDR_YMAX]             = (unsigned char)((height - 1) % 256);
+    hdr[HDR_YMAX + 1]         = (unsigned char)((height - 1) / 256);

     hdr[HDR_PALETTEINFO]      = 1;
 
     stream.Write(hdr, 128);
     hdr[HDR_PALETTEINFO]      = 1;
 
     stream.Write(hdr, 128);