Fixed the drawing of the HRules so they don't try to iterate over all

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

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index d28a456f6a3d13797b5acc2ccc3f08e3f667ab5f..846130b6877f5c0f064a74e6a7b45f914e1e1105 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -2,7 +2,7 @@
 // Name:        imagpcx.cpp
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Name:        imagpcx.cpp
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>

-// Version:     1.00
+// Version:     1.1

 // CVS-ID:      $Id$
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 // CVS-ID:      $Id$
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence


@@ -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"


@@ -56,8 +56,8 @@ void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)
     {
         data = (unsigned char) *(p++);
 
     {
         data = (unsigned char) *(p++);
 

-        // Up to 63 bytes with the same value can be stored using a
-        // single { cont, value } pair.
+        // Up to 63 bytes with the same value can be stored using
+        // a single { cont, value } pair.

         //
         if ((data == last) && (cont < 63))
         {
         //
         if ((data == last) && (cont < 63))
         {


@@ -65,8 +65,7 @@ void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)
         }
         else
         {
         }
         else
         {

-            // Need to write a 'counter' byte?
-            //
+            // need to write a 'counter' byte?

             if ((cont > 1) || ((last & 0xC0) == 0xC0))
                 s.PutC((char) (cont | 0xC0));
 
             if ((cont > 1) || ((last & 0xC0) == 0xC0))
                 s.PutC((char) (cont | 0xC0));
 


@@ -76,8 +75,7 @@ void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)
         }
     }
 
         }
     }
 

-    // Write the last one and return;
-    //
+    // write the last one and return;

     if ((cont > 1) || ((last & 0xC0) == 0xC0))
         s.PutC((char) (cont | 0xC0));
 
     if ((cont > 1) || ((last & 0xC0) == 0xC0))
         s.PutC((char) (cont | 0xC0));
 


@@ -93,7 +91,7 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
     // end of each plane inside a scanline). Only use this function
     // to read one or more _complete_ scanlines. Else, more than
     // 'size' bytes might be read and the buffer might overflow.
     // end of each plane inside a scanline). Only use this function
     // to read one or more _complete_ scanlines. Else, more than
     // 'size' bytes might be read and the buffer might overflow.

-    //
+

     while (size > 0)
     {
         data = (unsigned char)s.GetC();
     while (size > 0)
     {
         data = (unsigned char)s.GetC();


@@ -101,10 +99,10 @@ 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)
         {
         if ((data & 0xC0) != 0xC0)
         {

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

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


@@ -112,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;
         }
     }


@@ -172,13 +170,13 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
 
     // Read PCX header and check the version number (it must
     // be at least 5 or higher for 8 bit and 24 bit images).
 
     // Read PCX header and check the version number (it must
     // be at least 5 or higher for 8 bit and 24 bit images).

-    //
+

     stream.Read(hdr, 128);
 
     if (hdr[HDR_VERSION] < 5) return wxPCX_VERERR;
 
     // Extract all image info from the PCX header.
     stream.Read(hdr, 128);
 
     if (hdr[HDR_VERSION] < 5) return wxPCX_VERERR;
 
     // Extract all image info from the PCX header.

-    //
+

     encoding     = hdr[HDR_ENCODING];
     nplanes      = hdr[HDR_NPLANES];
     bitsperpixel = hdr[HDR_BITSPERPIXEL];
     encoding     = hdr[HDR_ENCODING];
     nplanes      = hdr[HDR_NPLANES];
     bitsperpixel = hdr[HDR_BITSPERPIXEL];


@@ -190,7 +188,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
 
     // Check image format. Currently supported formats are
     // 8 bits (8 bpp, 1 plane) and 24 bits (8 bpp, 3 planes).
 
     // Check image format. Currently supported formats are
     // 8 bits (8 bpp, 1 plane) and 24 bits (8 bpp, 3 planes).

-    //
+

     if ((nplanes == 3) && (bitsperpixel == 8))
         format = wxPCX_24BIT;
     else if ((nplanes == 1) && (bitsperpixel == 8))
     if ((nplanes == 3) && (bitsperpixel == 8))
         format = wxPCX_24BIT;
     else if ((nplanes == 1) && (bitsperpixel == 8))


@@ -209,9 +207,8 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
     // and another to replace 'colour indexes' with RGB
     // values.
 
     // and another to replace 'colour indexes' with RGB
     // values.
 

-

     // Resize the image and allocate memory for a scanline.
     // Resize the image and allocate memory for a scanline.

-    //
+

     image->Create(width, height);
 
     if (!image->Ok())
     image->Create(width, height);
 
     if (!image->Ok())


@@ -222,7 +219,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
 
     // Now start reading the file, line by line, and store
     // the data in the format required by wxImage.
 
     // Now start reading the file, line by line, and store
     // the data in the format required by wxImage.

-    //
+

     dst = image->GetData();
 
     for (j = height; j; j--)
     dst = image->GetData();
 
     for (j = height; j; j--)


@@ -261,7 +258,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
 
     // For 8 bit images, we read the palette, and then do a second
     // pass replacing indexes with their RGB values;
 
     // For 8 bit images, we read the palette, and then do a second
     // pass replacing indexes with their RGB values;

-    //
+

     if (format == wxPCX_8BIT)
     {
         unsigned char index;
     if (format == wxPCX_8BIT)
     {
         unsigned char index;


@@ -279,6 +276,18 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
             *(p++) = pal[3 * index + 1];
             *(p++) = pal[3 * index + 2];
         }
             *(p++) = pal[3 * index + 1];
             *(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];
+        for (i = 0; i < 256; i++)
+        {
+            r[i] = pal[3*i + 0];
+            g[i] = pal[3*i + 1];
+            b[i] = pal[3*i + 2];
+        }
+        image->SetPalette(wxPalette(256, r, g, b));
+        delete[] r; delete[] g; delete[] b;

     }
 
     return wxPCX_OK;
     }
 
     return wxPCX_OK;


@@ -287,8 +296,9 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
 // SavePCX:
 //  Saves a PCX file into the wxImage object pointed by image.
 //  Returns wxPCX_OK on success, or an error code otherwise
 // SavePCX:
 //  Saves a PCX file into the wxImage object pointed by image.
 //  Returns wxPCX_OK on success, or an error code otherwise

-//  (see above for error codes). Currently, always saves images
-//  in 24 bit format. XXX
+//  (see above for error codes). Will try to save as 8-bit
+//  PCX if possible, and then fall back to 24-bit if there
+//  are more than 256 different colours.

 //
 int SavePCX(wxImage *image, wxOutputStream& stream)
 {
 //
 int SavePCX(wxImage *image, wxOutputStream& stream)
 {


@@ -303,9 +313,9 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
     wxHashTable h(wxKEY_INTEGER);   // image histogram
     unsigned long key;              // key in the hashtable
     unsigned int i;
     wxHashTable h(wxKEY_INTEGER);   // image histogram
     unsigned long key;              // key in the hashtable
     unsigned int i;

- 
+

     // See if we can save as 8 bit.
     // See if we can save as 8 bit.

-    //
+

     if (image->CountColours(256) <= 256)
     {
         image->ComputeHistogram(h);
     if (image->CountColours(256) <= 256)
     {
         image->ComputeHistogram(h);


@@ -316,7 +326,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
     // Get image dimensions, calculate bytesperline (must be even,
     // according to PCX specs) and allocate space for one complete
     // scanline.
     // Get image dimensions, calculate bytesperline (must be even,
     // according to PCX specs) and allocate space for one complete
     // scanline.

-    //
+

     if (!image->Ok())
         return wxPCX_INVFORMAT;
 
     if (!image->Ok())
         return wxPCX_INVFORMAT;
 


@@ -331,7 +341,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
 
     // Build header data and write it to the stream. Initially,
     // set all bytes to zero (most values default to zero).
 
     // Build header data and write it to the stream. Initially,
     // set all bytes to zero (most values default to zero).

-    //
+

     memset(hdr, 0, sizeof(hdr));
 
     hdr[HDR_MANUFACTURER]     = 10;
     memset(hdr, 0, sizeof(hdr));
 
     hdr[HDR_MANUFACTURER]     = 10;


@@ -339,18 +349,18 @@ 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);
 
     // Encode image data line by line and write it to the stream
     hdr[HDR_PALETTEINFO]      = 1;
 
     stream.Write(hdr, 128);
 
     // Encode image data line by line and write it to the stream

-    //
+

     src = image->GetData();
 
     for (; height; height--)
     src = image->GetData();
 
     for (; height; height--)


@@ -370,7 +380,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
                     key = (r << 16) | (g << 8) | b;
 
                     hnode = (wxHNode *) h.Get(key);
                     key = (r << 16) | (g << 8) | b;
 
                     hnode = (wxHNode *) h.Get(key);

-                    p[i] = hnode->index;
+                    p[i] = (unsigned char)hnode->index;

                 }
                 break;
             }
                 }
                 break;
             }


@@ -388,11 +398,11 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
 
         RLEencode(p, bytesperline * nplanes, stream);
     }
 
         RLEencode(p, bytesperline * nplanes, stream);
     }

-    
+

     free(p);
 
     // For 8 bit images, build the palette and write it to the stream
     free(p);
 
     // For 8 bit images, build the palette and write it to the stream

-    //
+

     if (format == wxPCX_8BIT)
     {
         wxNode *node;
     if (format == wxPCX_8BIT)
     {
         wxNode *node;


@@ -446,10 +456,10 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
         {
             switch (error)
             {
         {
             switch (error)
             {

-                case wxPCX_INVFORMAT: wxLogError(_("wxPCXHandler: image format unsupported")); break;
-                case wxPCX_MEMERR:    wxLogError(_("wxPCXHandler: couldn't allocate memory")); break;
-                case wxPCX_VERERR:    wxLogError(_("wxPCXHandler: version number too low")); break;
-                default:              wxLogError(_("wxPCXHandler: unknown error !!!"));
+                case wxPCX_INVFORMAT: wxLogError(_("PCX: image format unsupported")); break;
+                case wxPCX_MEMERR:    wxLogError(_("PCX: couldn't allocate memory")); break;
+                case wxPCX_VERERR:    wxLogError(_("PCX: version number too low")); break;
+                default:              wxLogError(_("PCX: unknown error !!!"));

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


@@ -469,9 +479,9 @@ bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
         {
             switch (error)
             {
         {
             switch (error)
             {

-                case wxPCX_INVFORMAT: wxLogError(_("wxPCXHandler: invalid image")); break;
-                case wxPCX_MEMERR:    wxLogError(_("wxPCXHandler: couldn't allocate memory")); break;
-                default:              wxLogError(_("wxPCXHandler: unknown error !!!"));
+                case wxPCX_INVFORMAT: wxLogError(_("PCX: invalid image")); break;
+                case wxPCX_MEMERR:    wxLogError(_("PCX: couldn't allocate memory")); break;
+                default:              wxLogError(_("PCX: unknown error !!!"));

             }
         }
     }
             }
         }
     }