X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/common/imagpcx.cpp

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 846130b687..2e50e2c5a5 100644
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -277,9 +277,10 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
             *(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];
@@ -287,7 +288,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream)
             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;
@@ -310,7 +311,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
     unsigned int bytesperline;      // bytes per line (each plane)
     int nplanes = 3;                // number of planes
     int format = wxPCX_24BIT;       // image format (8 bit, 24 bit)
-    wxHashTable h(wxKEY_INTEGER);   // image histogram
+    wxImageHistogram histogram;     // image histogram
     unsigned long key;              // key in the hashtable
     unsigned int i;
 
@@ -318,7 +319,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
 
     if (image->CountColours(256) <= 256)
     {
-        image->ComputeHistogram(h);
+        image->ComputeHistogram(histogram);
         format = wxPCX_8BIT;
         nplanes = 1;
     }
@@ -370,7 +371,6 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
             case wxPCX_8BIT:
             {
                 unsigned char r, g, b;
-                wxHNode *hnode;
 
                 for (i = 0; i < width; i++)
                 {
@@ -379,8 +379,7 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
                     b = *(src++);
                     key = (r << 16) | (g << 8) | b;
 
-                    hnode = (wxHNode *) h.Get(key);
-                    p[i] = (unsigned char)hnode->index;
+                    p[i] = (unsigned char)histogram[key].index;
                 }
                 break;
             }
@@ -401,26 +400,22 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
 
     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)
     {
-        wxNode *node;
-        wxHNode *hnode;
-
         // 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);