Fixes for previous fixes

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

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 0c631d4d8c37184920c4a5c746c6dc5fb11b0f72..cc45398eaf461c2025e9cafa1d663586016a5b77 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -2,16 +2,15 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 

-/*
-   We don't put pragma implement in this file because it is already present in
-   src/common/image.cpp
-*/
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#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"


@@ -22,11 +21,12 @@
 
 #ifndef WX_PRECOMP
 #  include "wx/defs.h"
 
 #ifndef WX_PRECOMP
 #  include "wx/defs.h"

+#  include "wx/palette.h"

 #endif
 
 #endif
 

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

 
 

-#include "wx/image.h"
+#include "wx/imagpcx.h"

 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/log.h"
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/log.h"


@@ -37,7 +37,15 @@
 #include "wx/object.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/object.h"
 
 //-----------------------------------------------------------------------------

-// PCX decoding
+// wxPCXHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+//-----------------------------------------------------------------------------
+// RLE encoding and decoding

 //-----------------------------------------------------------------------------
 
 void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)
 //-----------------------------------------------------------------------------
 
 void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)


@@ -57,8 +65,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))
         {


@@ -66,8 +74,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));
 


@@ -77,9 +84,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));
 


@@ -95,7 +100,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();


@@ -103,10 +108,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


@@ -114,14 +119,18 @@ 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;
         }
     }
 }
 
 

-/* PCX header */
+//-----------------------------------------------------------------------------
+// PCX reading and saving
+//-----------------------------------------------------------------------------
+
+// PCX header

 #define HDR_MANUFACTURER    0
 #define HDR_VERSION         1
 #define HDR_ENCODING        2
 #define HDR_MANUFACTURER    0
 #define HDR_VERSION         1
 #define HDR_ENCODING        2


@@ -166,18 +175,17 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
     int nplanes;                    // number of planes
     int encoding;                   // is the image RLE encoded?
     int format;                     // image format (8 bit, 24 bit)
     int nplanes;                    // number of planes
     int encoding;                   // is the image RLE encoded?
     int format;                     // image format (8 bit, 24 bit)

-    unsigned int i;
-    off_t pos;
+    unsigned int i, j;

 
     // 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];


@@ -189,7 +197,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))


@@ -197,24 +205,19 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
     else
         return wxPCX_INVFORMAT;
 
     else
         return wxPCX_INVFORMAT;
 

-    // If the image is of type wxPCX_8BIT, then there is a
-    // palette at the end of the file. Read it now before
-    // proceeding.
-    //
-    if (format == wxPCX_8BIT)
-    {
-        pos = stream.TellI();
-        stream.SeekI(-769, wxFromEnd);
+    // If the image is of type wxPCX_8BIT, then there is
+    // a palette at the end of the image data. If we were
+    // working with a file, we could seek at the end to the
+    // end (SeekI(-769, wxFromEnd) and read the palette
+    // before proceeding. Unfortunately, this would prevent
+    // loading several PCXs in a single stream, so we can't
+    // do it. Thus, 8-bit images will have to be decoded in
+    // two passes: one to read and decode the image data,
+    // and another to replace 'colour indexes' with RGB
+    // values.

 
 

-        if (stream.GetC() != 12)
-            return wxPCX_INVFORMAT;
+    // Resize the image and allocate memory for a scanline.

 
 

-        stream.Read(pal, 768);
-        stream.SeekI(pos, wxFromStart);
-    }
-
-    // Allocate memory for a scanline and resize the image.
-    //

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


@@ -225,10 +228,10 @@ 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();
 
     dst = image->GetData();
 

-    for (; height; height--)
+    for (j = height; j; j--)

     {
         if (encoding)
             RLEdecode(p, bytesperline * nplanes, stream);
     {
         if (encoding)
             RLEdecode(p, bytesperline * nplanes, stream);


@@ -241,9 +244,9 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
             {
                 for (i = 0; i < width; i++)
                 {
             {
                 for (i = 0; i < width; i++)
                 {

-                    *(dst++) = pal[ 3 * (p[i]) ];
-                    *(dst++) = pal[ 3 * (p[i]) + 1];
-                    *(dst++) = pal[ 3 * (p[i]) + 2];
+                    // first pass, just store the colour index
+                    *dst = p[i];
+                    dst += 3;

                 }
                 break;
             }
                 }
                 break;
             }


@@ -262,14 +265,50 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
 
     free(p);
 
 
     free(p);
 

+    // 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 (stream.GetC() != 12)
+            return wxPCX_INVFORMAT;
+
+        stream.Read(pal, 768);
+
+        p = image->GetData();
+        for (unsigned long k = height * width; k; k--)
+        {
+            index = *p;
+            *(p++) = pal[3 * index];
+            *(p++) = pal[3 * index + 1];
+            *(p++) = pal[3 * index + 2];
+        }
+
+#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];
+            g[i] = pal[3*i + 1];
+            b[i] = pal[3*i + 2];
+        }
+        image->SetPalette(wxPalette(256, r, g, b));
+#endif // wxUSE_PALETTE
+    }
+

     return wxPCX_OK;
 }
 
 // SavePCX:
 //  Saves a PCX file into the wxImage object pointed by image.
 //  Returns wxPCX_OK on success, or an error code otherwise
     return wxPCX_OK;
 }
 
 // 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)
 {


@@ -279,34 +318,25 @@ 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;                    // number of planes
-    int format;                     // image format (8 bit, 24 bit)
-    wxHashTable h(wxKEY_INTEGER);   // image histogram
-    unsigned long ncolours;         // num. of different colours
+    int 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
     unsigned int i;
     unsigned long key;              // key in the hashtable
     unsigned int i;

- 
-    // Get the histogram of the image, and decide whether to save
-    // as 8 bit or 24 bit, according to the number of colours.
-    //
-    ncolours = image->CountColours(257);

 
 

-    if (ncolours <= 256)
+    // See if we can save as 8 bit.
+
+    if (image->CountColours(256) <= 256)

     {
     {

-        image->ComputeHistogram(h);
+        image->ComputeHistogram(histogram);

         format = wxPCX_8BIT;
         nplanes = 1;
     }
         format = wxPCX_8BIT;
         nplanes = 1;
     }

-    else
-    {
-        format = wxPCX_24BIT;
-        nplanes = 3;
-    }

 
     // 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;
 


@@ -321,7 +351,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;


@@ -329,18 +359,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--)


@@ -350,7 +380,6 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
             case wxPCX_8BIT:
             {
                 unsigned char r, g, b;
             case wxPCX_8BIT:
             {
                 unsigned char r, g, b;

-                wxHNode *hnode;

 
                 for (i = 0; i < width; i++)
                 {
 
                 for (i = 0; i < width; i++)
                 {


@@ -359,8 +388,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
                     b = *(src++);
                     key = (r << 16) | (g << 8) | b;
 
                     b = *(src++);
                     key = (r << 16) | (g << 8) | b;
 

-                    hnode = (wxHNode *) h.Get(key);
-                    p[i] = hnode->index;
+                    p[i] = (unsigned char)histogram[key].index;

                 }
                 break;
             }
                 }
                 break;
             }


@@ -375,32 +403,28 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
                 break;
             }
         }
                 break;
             }
         }

-    
+

         RLEencode(p, bytesperline * nplanes, stream);
     }
         RLEencode(p, bytesperline * nplanes, stream);
     }

-    
+

     free(p);
 
     free(p);
 

-    // For 8 bit images, build the palette and write it to the stream
-    //
+    // For 8 bit images, build the palette and write it to the stream:

     if (format == wxPCX_8BIT)
     {
     if (format == wxPCX_8BIT)
     {

-        wxNode *node;
-        wxHNode *hnode;
-

         // zero unused colours
         memset(pal, 0, sizeof(pal));
 
         // zero unused colours
         memset(pal, 0, sizeof(pal));
 

-        h.BeginFind();
-        while ((node = h.Next()) != NULL)
+        unsigned long index;
+        
+        for (wxImageHistogram::iterator entry = histogram.begin();
+             entry != histogram.end(); entry++ )

         {
         {

-            key = node->GetKeyInteger();
-            hnode = (wxHNode *) node->GetData();
-
-            pal[3 * hnode->index]     = (unsigned char)(key >> 16);
-            pal[3 * hnode->index + 1] = (unsigned char)(key >> 8);
-            pal[3 * hnode->index + 2] = (unsigned char)(key);
-            delete hnode;
+            key = entry->first;
+            index = entry->second.index;
+            pal[3 * index]     = (unsigned char)(key >> 16);
+            pal[3 * index + 1] = (unsigned char)(key >> 8);
+            pal[3 * index + 2] = (unsigned char)(key);

         }
 
         stream.PutC(12);
         }
 
         stream.PutC(12);


@@ -414,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;


@@ -436,10 +458,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();


@@ -459,9 +481,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 !!!"));

             }
         }
     }
             }
         }
     }


@@ -471,14 +493,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