Typo fix

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

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 4b4e47e045eb2abf31da476a0fcfd802427a97ee..709cc6e7dcbace751e0f48afabc8f35e2ee11b28 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xpmdecod.cpp
+// Name:        src/common/xpmdecod.cpp

 // Purpose:     wxXPMDecoder
 // Author:      John Cristy, Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxXPMDecoder
 // Author:      John Cristy, Vaclav Slavik
 // RCS-ID:      $Id$


@@ -90,44 +90,38 @@ license is as follows:
  * in this Software without prior written authorization from GROUPE BULL.
  */
 
  * in this Software without prior written authorization from GROUPE BULL.
  */
 

-#ifdef __GNUG__
-#pragma implementation "xpmdecod.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#  pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_IMAGE && wxUSE_XPM
+
+#include "wx/xpmdecod.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/defs.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/hashmap.h"
+    #include "wx/stream.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#if wxUSE_IMAGE && wxUSE_XPM
-
-#include "wx/stream.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 <string.h>

-

 #include <ctype.h>
 
 #include <ctype.h>
 

-#include "wx/xpmdecod.h"
-

 #if wxUSE_STREAMS
 bool wxXPMDecoder::CanRead(wxInputStream& stream)
 {
     unsigned char buf[9];
 
     if ( !stream.Read(buf, WXSIZEOF(buf)) )
 #if wxUSE_STREAMS
 bool wxXPMDecoder::CanRead(wxInputStream& stream)
 {
     unsigned char buf[9];
 
     if ( !stream.Read(buf, WXSIZEOF(buf)) )

-        return FALSE;
+        return false;

 
 

-    stream.SeekI(-(off_t)WXSIZEOF(buf), wxFromCurrent);
+    stream.SeekI(-(wxFileOffset)WXSIZEOF(buf), wxFromCurrent);

 
     return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0;
 }
 
     return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0;
 }


@@ -178,7 +172,10 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
             if ( (*q == '*') && (*(q + 1) == '/') )
                 break;
         }
             if ( (*q == '*') && (*(q + 1) == '/') )
                 break;
         }

-        strcpy(p, q + 2);
+
+        // memmove allows overlaps (unlike strcpy):
+        size_t cpylen = strlen(q + 2) + 1;
+        memmove(p, q + 2, cpylen);

     }
 
     /*
     }
 
     /*


@@ -218,7 +215,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
         return wxNullImage;
     }
 
         return wxNullImage;
     }
 

-    xpm_lines = new const char*[lines_cnt];
+    xpm_lines = new const char*[lines_cnt + 1];

     xpm_lines[0] = xpm_buffer;
     line = 1;
     for (p = xpm_buffer; (*p != '\0') && (line < lines_cnt); p++)
     xpm_lines[0] = xpm_buffer;
     line = 1;
     for (p = xpm_buffer; (*p != '\0') && (line < lines_cnt); p++)


@@ -231,16 +228,14 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
         }
     }
 
         }
     }
 

+    xpm_lines[lines_cnt] = NULL;
+

     /*
      *  Read the image:
      */
     wxImage img = ReadData(xpm_lines);
 
     /*
      *  Read the image:
      */
     wxImage img = ReadData(xpm_lines);
 

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

     delete[] xpm_lines;
     delete[] xpm_lines;

-#endif

 
     return img;
 }
 
     return img;
 }


@@ -516,18 +511,18 @@ static unsigned char ParseHexadecimal(char digit1, char digit2)
     unsigned char i1, i2;
 
     if (digit1 >= 'a')
     unsigned char i1, i2;
 
     if (digit1 >= 'a')

-        i1 = digit1 - 'a' + 0x0A;
+        i1 = (unsigned char)(digit1 - 'a' + 0x0A);

     else if (digit1 >= 'A')
     else if (digit1 >= 'A')

-        i1 = digit1 - 'A' + 0x0A;
+        i1 = (unsigned char)(digit1 - 'A' + 0x0A);

     else
     else

-        i1 = digit1 - '0';
+        i1 = (unsigned char)(digit1 - '0');

     if (digit2 >= 'a')
     if (digit2 >= 'a')

-        i2 = digit2 - 'a' + 0x0A;
+        i2 = (unsigned char)(digit2 - 'a' + 0x0A);

     else if (digit2 >= 'A')
     else if (digit2 >= 'A')

-        i2 = digit2 - 'A' + 0x0A;
+        i2 = (unsigned char)(digit2 - 'A' + 0x0A);

     else
     else

-        i2 = digit2 - '0';
-    return (0x10 * i1 + i2);
+        i2 = (unsigned char)(digit2 - '0');
+    return (unsigned char)(0x10 * i1 + i2);

 }
 
 static bool GetRGBFromName(const char *inname, bool *isNone,
 }
 
 static bool GetRGBFromName(const char *inname, bool *isNone,


@@ -547,11 +542,11 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
         *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]);
         *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;
-        return TRUE;
+        *isNone = false;
+        return true;

     }
 
     }
 

-    name = strdup(inname);
+    name = wxStrdupA(inname);

 
     // theRGBRecords[] has no names with spaces, and no grey, but a
     // lot of gray...
 
     // theRGBRecords[] has no names with spaces, and no grey, but a
     // lot of gray...


@@ -569,7 +564,7 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
     p = name;
     while (*p)
     {
     p = name;
     while (*p)
     {

-        *p = tolower(*p);
+        *p = (char)tolower(*p);

         p++;
     }
 
         p++;
     }
 


@@ -582,12 +577,12 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
     bool found;
     if ( strcmp(name, "none") == 0 )
     {
     bool found;
     if ( strcmp(name, "none") == 0 )
     {

-        *isNone = TRUE;
-        found = TRUE;
+        *isNone = true;
+        found = true;

     }
     else // not "None"
     {
     }
     else // not "None"
     {

-        found = FALSE;
+        found = false;

 
         // binary search:
         left = 0;
 
         // binary search:
         left = 0;


@@ -602,8 +597,8 @@ static bool GetRGBFromName(const char *inname, bool *isNone,
                 *r = (unsigned char)((rgbVal >> 16) & 0xFF);
                 *g = (unsigned char)((rgbVal >> 8) & 0xFF);
                 *b = (unsigned char)((rgbVal) & 0xFF);
                 *r = (unsigned char)((rgbVal >> 16) & 0xFF);
                 *g = (unsigned char)((rgbVal >> 8) & 0xFF);
                 *b = (unsigned char)((rgbVal) & 0xFF);

-                *isNone = FALSE;
-                found = TRUE;
+                *isNone = false;
+                found = true;

                 break;
             }
             else if ( cmp < 0 )
                 break;
             }
             else if ( cmp < 0 )


@@ -656,12 +651,15 @@ static const char *ParseColor(const char *data)
 
 struct wxXPMColourMapData
 {
 
 struct wxXPMColourMapData
 {

+    wxXPMColourMapData() { R = G = B = 0; }

     unsigned char R,G,B;
 };
 WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap);
 
     unsigned char R,G,B;
 };
 WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap);
 

-wxImage wxXPMDecoder::ReadData(const char **xpm_data)
+wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)

 {
 {

+    wxCHECK_MSG(xpm_data, wxNullImage, wxT("NULL XPM data") );
+

     wxImage img;
     int count;
     unsigned width, height, colors_cnt, chars_per_pixel;
     wxImage img;
     int count;
     unsigned width, height, colors_cnt, chars_per_pixel;


@@ -669,18 +667,19 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
     wxChar key[64];
     const char *clr_def;
     bool hasMask;
     wxChar key[64];
     const char *clr_def;
     bool hasMask;

-    wxXPMColourMapData clr_data;

     wxXPMColourMap clr_tbl;
     wxXPMColourMap clr_tbl;

+    wxXPMColourMap::iterator it;
+    wxString maskKey;

 
     /*
      *  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 )
     {

-        wxLogError(_T("XPM: Not XPM data!"));
+        wxLogError(_("XPM: incorrect header format!"));

         return wxNullImage;
     }
 
         return wxNullImage;
     }
 


@@ -689,54 +688,79 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
     //     8bit RGB...
     wxCHECK_MSG(chars_per_pixel < 64, wxNullImage, wxT("XPM colormaps this large not supported."));
 
     //     8bit RGB...
     wxCHECK_MSG(chars_per_pixel < 64, wxNullImage, wxT("XPM colormaps this large not supported."));
 

-    img.Create(width, height);
-    if ( !img.Ok() ) return img;
+    if ( !img.Create(width, height) )
+        return wxNullImage;

 
 

-    img.SetMask(FALSE);
+    img.SetMask(false);

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

-    hasMask = FALSE;
+    hasMask = false;

 
     /*
      *  Create colour map:
      */
 
     /*
      *  Create colour map:
      */

+    wxXPMColourMapData clr_data;

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

+        const char *xmpColLine = xpm_data[1 + i];
+
+        // we must have at least " x y" after the colour index, hence +5
+        if ( !xmpColLine || strlen(xmpColLine) < chars_per_pixel + 5 )
+        {
+            wxLogError(_("XPM: incorrect colour description in line %d"),
+                       (int)(1 + i));
+            return wxNullImage;
+        }
+

         for (i_key = 0; i_key < chars_per_pixel; i_key++)
         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);
+            key[i_key] = (wxChar)xmpColLine[i_key];
+        clr_def = ParseColor(xmpColLine + chars_per_pixel);

 
         if ( clr_def == NULL )
         {
 
         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;
+            wxLogError(_("XPM: malformed colour definition '%s' at line %d!"),
+                       xmpColLine, (int)(1 + i));
+            return wxNullImage;
+        }
+
+        bool isNone = false;
+        if ( !GetRGBFromName(clr_def, &isNone,
+                             &clr_data.R, &clr_data.G, &clr_data.B) )
+        {
+            wxLogError(_("XPM: malformed colour definition '%s' at line %d!"),
+                       xmpColLine, (int)(1 + i));
+            return wxNullImage;

         }
         }

-        else
+
+        if ( isNone )

         {
         {

-            bool isNone;
-            if ( !GetRGBFromName(clr_def, &isNone,
-                                 &clr_data.R, &clr_data.G, &clr_data.B) )
-            {
-                wxLogError(_("XPM: malformed colour definition '%s'!"), xpm_data[1+i]);
-                clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
-            }
-            else
+            img.SetMask(true);
+            img.SetMaskColour(255, 0, 255);
+            clr_data.R =
+            clr_data.B = 255;
+            clr_data.G = 0;
+            hasMask = true;
+            maskKey = key;
+        }
+
+        clr_tbl[key] = clr_data;
+    }
+
+    /*
+     *  Modify colour entries with RGB = (255,0,255) to (255,0,254) if
+     *  mask colour is present (so that existing pixels with (255,0,255)
+     *  magenta colour are not incorrectly made transparent):
+     */
+    if (hasMask)
+    {
+        for (it = clr_tbl.begin(); it != clr_tbl.end(); ++it)
+        {
+            if (it->second.R == 255 && it->second.G == 0 &&
+                it->second.B == 255 &&
+                it->first != maskKey)

             {
             {

-                if ( isNone )
-                {
-                    img.SetMask(TRUE);
-                    img.SetMaskColour(255, 0, 255);
-                    hasMask = TRUE;
-                    clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
-                }
-                else
-                {
-                    if ( hasMask && clr_data.R == 255 &&
-                                    clr_data.G == 0 && clr_data.B == 255 )
-                        clr_data.B = 254;
-                }
+                it->second.B = 254;

             }
         }
             }
         }

-        clr_tbl[key] = clr_data;

     }
 
     /*
     }
 
     /*


@@ -746,18 +770,34 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
     unsigned char *img_data = img.GetData();
     wxXPMColourMap::iterator entry;
     wxXPMColourMap::iterator end = clr_tbl.end();
     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)
         {

+            const char *xpmImgLine = xpm_data[1 + colors_cnt + j];
+            if ( !xpmImgLine || strlen(xpmImgLine) < width*chars_per_pixel )
+            {
+                wxLogError(_("XPM: truncated image data at line %d!"),
+                           (int)(1 + colors_cnt + j));
+                return wxNullImage;
+            }
+

             for (i_key = 0; i_key < chars_per_pixel; i_key++)
             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];
+            {
+                key[i_key] = (wxChar)xpmImgLine[chars_per_pixel * i + i_key];
+            }
+

             entry = clr_tbl.find(key);
             if ( entry == end )
             {
                 wxLogError(_("XPM: Malformed pixel data!"));
             entry = clr_tbl.find(key);
             if ( entry == end )
             {
                 wxLogError(_("XPM: Malformed pixel data!"));

+
+                // better return right now as otherwise we risk to flood the
+                // user with error messages as something seems to be seriously
+                // wrong with the file and so we could give this message for
+                // each remaining pixel if we don't bail out
+                return wxNullImage;

             }
             else
             {
             }
             else
             {