don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

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

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 08ad872940368b948287f389f4f9beaf408c8ffb..73ce1f5d4b769336ba6abb3a98944d25bc9c88aa 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -111,9 +111,14 @@ license is as follows:
 #include "wx/image.h"
 #include "wx/utils.h"
 #include "wx/log.h"
 #include "wx/image.h"
 #include "wx/utils.h"
 #include "wx/log.h"

+#include "wx/hashmap.h"

 #include "wx/intl.h"
 #include <string.h>
 
 #include "wx/intl.h"
 #include <string.h>
 

+#ifdef __VISUALC__
+#include <ctype.h>
+#endif
+

 #include "wx/xpmdecod.h"
 
 #if wxUSE_STREAMS
 #include "wx/xpmdecod.h"
 
 #if wxUSE_STREAMS


@@ -130,18 +135,22 @@ bool wxXPMDecoder::CanRead(wxInputStream& stream)
 wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
 {
     size_t length = stream.GetSize();
 wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
 {
     size_t length = stream.GetSize();

-    wxCHECK_MSG(length != 0, wxNullImage, wxT("Cannot read XPM from stream of unknown size"));
+    wxCHECK_MSG( length != 0, wxNullImage,
+                 wxT("Cannot read XPM from stream of unknown size") );

 
 

-    char *xpm_buffer = new char[length];
-    char *p, *q;
-    size_t i;
+    // use a smart buffer to be sure to free memory even when we return on
+    // error
+    wxCharBuffer buffer(length);

 
 

-    if ( stream.Read(xpm_buffer, length).LastError() != wxSTREAM_NO_ERROR )
-        return FALSE;
+    char *xpm_buffer = (char *)buffer.data();
+    if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR )
+        return wxNullImage;
+    xpm_buffer[length] = '\0';

 
     /*
      *  Remove comments from the file:
      */
 
     /*
      *  Remove comments from the file:
      */

+    char *p, *q;

     for (p = xpm_buffer; *p != '\0'; p++)
     {
         if ( (*p == '"') || (*p == '\'') )
     for (p = xpm_buffer; *p != '\0'; p++)
     {
         if ( (*p == '"') || (*p == '\'') )


@@ -175,7 +184,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
     /*
      *  Remove unquoted characters:
      */
     /*
      *  Remove unquoted characters:
      */

-    i = 0;
+    size_t i = 0;

     for (p = xpm_buffer; *p != '\0'; p++)
     {
         if ( *p != '"' )
     for (p = xpm_buffer; *p != '\0'; p++)
     {
         if ( *p != '"' )


@@ -203,6 +212,12 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
             lines_cnt++;
     }
 
             lines_cnt++;
     }
 

+    if ( !lines_cnt )
+    {
+        // this doesn't really look an XPM image
+        return wxNullImage;
+    }
+

     xpm_lines = new const char*[lines_cnt];
     xpm_lines[0] = xpm_buffer;
     line = 1;
     xpm_lines = new const char*[lines_cnt];
     xpm_lines[0] = xpm_buffer;
     line = 1;


@@ -221,8 +236,12 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
      */
     wxImage img = ReadData(xpm_lines);
 
      */
     wxImage img = ReadData(xpm_lines);
 

-    delete[] xpm_buffer;
+#ifdef __WIN16__
+    delete[] (char**) xpm_lines;
+#else

     delete[] xpm_lines;
     delete[] xpm_lines;

+#endif
+

     return img;
 }
 #endif // wxUSE_STREAMS
     return img;
 }
 #endif // wxUSE_STREAMS


@@ -245,7 +264,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
 
 typedef struct
 {
 
 typedef struct
 {

-    char *name;
+    const char *name;

     wxUint32 rgb;
 } rgbRecord;
 
     wxUint32 rgb;
 } rgbRecord;
 


@@ -491,6 +510,25 @@ static rgbRecord theRGBRecords[] =
 };
 static int numTheRGBRecords = 234;
 
 };
 static int numTheRGBRecords = 234;
 

+static unsigned char ParseHexadecimal(char digit1, char digit2)
+{
+    unsigned char i1, i2;
+
+    if (digit1 >= 'a')
+        i1 = digit1 - 'a' + 0x0A;
+    else if (digit1 >= 'A')
+        i1 = digit1 - 'A' + 0x0A;
+    else
+        i1 = digit1 - '0';
+    if (digit2 >= 'a')
+        i2 = digit2 - 'a' + 0x0A;
+    else if (digit2 >= 'A')
+        i2 = digit2 - 'A' + 0x0A;
+    else
+        i2 = digit2 - '0';
+    return (0x10 * i1 + i2);
+}
+

 static bool GetRGBFromName(const char *inname, bool *isNone,
                            unsigned char *r, unsigned char*g, unsigned char *b)
 {
 static bool GetRGBFromName(const char *inname, bool *isNone,
                            unsigned char *r, unsigned char*g, unsigned char *b)
 {


@@ -500,19 +538,15 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
     char *name;
     char *grey, *p;
 
     char *name;
     char *grey, *p;
 

-    // #rrggbb are not in database, we parse them directly
-    if ( *inname == '#' && strlen(inname) == 7 )
+    // Neither #rrggbb nor #rrrrggggbbbb are in database, we parse them directly
+    size_t inname_len = strlen(inname);
+    if ( *inname == '#' && (inname_len == 7 || inname_len == 13))

     {
     {

-        char buf[3];
-        buf[2] = 0;
-        buf[0] = inname[1]; buf[1] = inname[2];
-        *r = (unsigned char) wxHexToDec(buf);
-        buf[0] = inname[3]; buf[1] = inname[4];
-        *g = (unsigned char) wxHexToDec(buf);
-        buf[0] = inname[5]; buf[1] = inname[6];
-        *b = (unsigned char) wxHexToDec(buf);
+        size_t ofs = (inname_len == 7) ? 2 : 4;
+        *r = ParseHexadecimal(inname[1], inname[2]);
+        *g = ParseHexadecimal(inname[1*ofs+1], inname[1*ofs+2]);
+        *b = ParseHexadecimal(inname[2*ofs+1], inname[2*ofs+2]);

         *isNone = FALSE;
         *isNone = FALSE;

-

         return TRUE;
     }
 
         return TRUE;
     }
 


@@ -544,41 +578,47 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
         grey[2] = 'a';
 
     // check for special 'none' colour:
         grey[2] = 'a';
 
     // check for special 'none' colour:

+    bool found;

     if ( strcmp(name, "none") == 0 )
     {
         *isNone = TRUE;
     if ( strcmp(name, "none") == 0 )
     {
         *isNone = TRUE;

-        return TRUE;
+        found = TRUE;

     }
     }

-
-    // binary search:
-    left = 0;
-    right = numTheRGBRecords - 1;
-    do
+    else // not "None"

     {
     {

-        middle = (left + right) / 2;
-        cmp = strcmp(name, theRGBRecords[middle].name);
-        if ( cmp == 0 )
-        {
-            rgbVal = theRGBRecords[middle].rgb;
-            *r = (rgbVal >> 16) & 0xFF;
-            *g = (rgbVal >> 8) & 0xFF;
-            *b = (rgbVal) & 0xFF;
-            *isNone = FALSE;
-            free(name);
-            return TRUE;
-        }
-        else if ( cmp < 0 )
+        found = FALSE;
+
+        // binary search:
+        left = 0;
+        right = numTheRGBRecords - 1;
+        do

         {
         {

-            right = middle - 1;
-        }
-        else
-        {           // > 0
-            left = middle + 1;
-        }
-    } while (left <= right);
+            middle = (left + right) / 2;
+            cmp = strcmp(name, theRGBRecords[middle].name);
+            if ( cmp == 0 )
+            {
+                rgbVal = theRGBRecords[middle].rgb;
+                *r = (unsigned char)((rgbVal >> 16) & 0xFF);
+                *g = (unsigned char)((rgbVal >> 8) & 0xFF);
+                *b = (unsigned char)((rgbVal) & 0xFF);
+                *isNone = FALSE;
+                found = TRUE;
+                break;
+            }
+            else if ( cmp < 0 )
+            {
+                right = middle - 1;
+            }
+            else // cmp > 0
+            {
+                left = middle + 1;
+            }
+        } while (left <= right);
+    }

 
     free(name);
 
     free(name);

-    return FALSE;
+
+    return found;

 }
 
 static const char *ParseColor(const char *data)
 }
 
 static const char *ParseColor(const char *data)


@@ -613,27 +653,28 @@ static const char *ParseColor(const char *data)
     return NULL;
 }
 
     return NULL;
 }
 

-class wxXPMColourMapData : public wxObject
+struct wxXPMColourMapData

 {
 {

-    public:
-        unsigned char R,G,B;
+    unsigned char R,G,B;

 };
 };

+WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap)

 
 wxImage wxXPMDecoder::ReadData(const char **xpm_data)
 {
     wxImage img;
     int count;
     unsigned width, height, colors_cnt, chars_per_pixel;
 
 wxImage wxXPMDecoder::ReadData(const char **xpm_data)
 {
     wxImage img;
     int count;
     unsigned width, height, colors_cnt, chars_per_pixel;

-    unsigned i, j;
-    char key[64];
+    size_t i, j, i_key;
+    wxChar key[64];

     const char *clr_def;
     bool hasMask;
     const char *clr_def;
     bool hasMask;

-    wxXPMColourMapData *clr_data;
-    wxHashTable clr_tbl(wxKEY_STRING);
+    wxXPMColourMapData clr_data;
+    wxXPMColourMap clr_tbl;

 
     /*
      *  Read hints and initialize structures:
      */
 
     /*
      *  Read hints and initialize structures:
      */

+     

     count = sscanf(xpm_data[0], "%u %u %u %u",
                    &width, &height, &colors_cnt, &chars_per_pixel);
     if ( count != 4 || width * height * colors_cnt == 0 )
     count = sscanf(xpm_data[0], "%u %u %u %u",
                    &width, &height, &colors_cnt, &chars_per_pixel);
     if ( count != 4 || width * height * colors_cnt == 0 )


@@ -651,32 +692,31 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
     if ( !img.Ok() ) return img;
 
     img.SetMask(FALSE);
     if ( !img.Ok() ) return img;
 
     img.SetMask(FALSE);

-    key[chars_per_pixel] = '\0';
+    key[chars_per_pixel] = wxT('\0');

     hasMask = FALSE;
     hasMask = FALSE;

-    clr_tbl.DeleteContents(TRUE);

 
     /*
      *  Create colour map:
      */
     for (i = 0; i < colors_cnt; i++)
     {
 
     /*
      *  Create colour map:
      */
     for (i = 0; i < colors_cnt; i++)
     {

-        memcpy(key, xpm_data[1 + i], chars_per_pixel);
-        clr_def = ParseColor(xpm_data[1 + i]);
-        clr_data = new wxXPMColourMapData;
+        for (i_key = 0; i_key < chars_per_pixel; i_key++)
+            key[i_key] = (wxChar)xpm_data[1 + i][i_key];
+        clr_def = ParseColor(xpm_data[1 + i] + chars_per_pixel);

 
         if ( clr_def == NULL )
         {
             wxLogError(_("XPM: malformed colour definition '%s'!"), xpm_data[1+i]);
 
         if ( clr_def == NULL )
         {
             wxLogError(_("XPM: malformed colour definition '%s'!"), xpm_data[1+i]);

-            clr_data->R = 255, clr_data->G = 0, clr_data->B = 255;
+            clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;

         }
         else
         {
             bool isNone;
             if ( !GetRGBFromName(clr_def, &isNone,
         }
         else
         {
             bool isNone;
             if ( !GetRGBFromName(clr_def, &isNone,

-                                 &clr_data->R, &clr_data->G, &clr_data->B) )
+                                 &clr_data.R, &clr_data.G, &clr_data.B) )

             {
                 wxLogError(_("XPM: malformed colour definition '%s'!"), xpm_data[1+i]);
             {
                 wxLogError(_("XPM: malformed colour definition '%s'!"), xpm_data[1+i]);

-                clr_data->R = 255, clr_data->G = 0, clr_data->B = 255;
+                clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;

             }
             else
             {
             }
             else
             {


@@ -685,17 +725,17 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
                     img.SetMask(TRUE);
                     img.SetMaskColour(255, 0, 255);
                     hasMask = TRUE;
                     img.SetMask(TRUE);
                     img.SetMaskColour(255, 0, 255);
                     hasMask = TRUE;

-                    clr_data->R = 255, clr_data->G = 0, clr_data->B = 255;
+                    clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;

                 }
                 else
                 {
                 }
                 else
                 {

-                    if ( hasMask && clr_data->R == 255 &&
-                                    clr_data->G == 0 && clr_data->B == 255 )
-                        clr_data->B = 254;
+                    if ( hasMask && clr_data.R == 255 &&
+                                    clr_data.G == 0 && clr_data.B == 255 )
+                        clr_data.B = 254;

                 }
             }
         }
                 }
             }
         }

-        clr_tbl.Put(key, clr_data);
+        clr_tbl[key] = clr_data;

     }
 
     /*
     }
 
     /*


@@ -703,23 +743,26 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
      */
 
     unsigned char *img_data = img.GetData();
      */
 
     unsigned char *img_data = img.GetData();

+    wxXPMColourMap::iterator entry;
+    wxXPMColourMap::iterator end = clr_tbl.end();
+    

     for (j = 0; j < height; j++)
     {
         for (i = 0; i < width; i++, img_data += 3)
         {
     for (j = 0; j < height; j++)
     {
         for (i = 0; i < width; i++, img_data += 3)
         {

-            memcpy(key,
-                   xpm_data[1 + colors_cnt + j] + chars_per_pixel * i,
-                   chars_per_pixel);
-            clr_data = (wxXPMColourMapData*) clr_tbl.Get(key);
-            if ( clr_data == NULL )
+            for (i_key = 0; i_key < chars_per_pixel; i_key++)
+                key[i_key] = (wxChar)xpm_data[1 + colors_cnt + j]
+                                             [chars_per_pixel * i + i_key];
+            entry = clr_tbl.find(key);
+            if ( entry == end )

             {
                 wxLogError(_("XPM: Malformed pixel data!"));
             }
             else
             {
             {
                 wxLogError(_("XPM: Malformed pixel data!"));
             }
             else
             {

-                img_data[0] = clr_data->R;
-                img_data[1] = clr_data->G;
-                img_data[2] = clr_data->B;
+                img_data[0] = entry->second.R;
+                img_data[1] = entry->second.G;
+                img_data[2] = entry->second.B;

             }
         }
     }
             }
         }
     }


@@ -727,5 +770,4 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
     return img;
 }
 
     return img;
 }
 

-

 #endif // wxUSE_IMAGE && wxUSE_XPM
 #endif // wxUSE_IMAGE && wxUSE_XPM