don't inherit font from the parent by default

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

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 1dc78c95d2618d020eb10f9e580f3490cecf4994..358131f241f007791e9f37f1ae8b7be32905fc12 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -90,7 +90,7 @@ 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xpmdecod.h"
 #endif
 
 #pragma implementation "xpmdecod.h"
 #endif
 


@@ -125,7 +125,7 @@ bool wxXPMDecoder::CanRead(wxInputStream& stream)
     unsigned char buf[9];
 
     if ( !stream.Read(buf, WXSIZEOF(buf)) )
     unsigned char buf[9];
 
     if ( !stream.Read(buf, WXSIZEOF(buf)) )

-        return FALSE;
+        return false;

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


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

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

     delete[] xpm_lines;
     delete[] xpm_lines;

-#endif

 
     return img;
 }
 
     return img;
 }


@@ -488,6 +484,7 @@ static rgbRecord theRGBRecords[] =
     {"seagreen", myRGB(82, 149, 132)},
     {"seashell", myRGB(255, 245, 238)},
     {"sienna", myRGB(150, 82, 45)},
     {"seagreen", myRGB(82, 149, 132)},
     {"seashell", myRGB(255, 245, 238)},
     {"sienna", myRGB(150, 82, 45)},

+    {"silver", myRGB(192, 192, 192)},

     {"skyblue", myRGB(114, 159, 255)},
     {"slateblue", myRGB(126, 136, 171)},
     {"slategray", myRGB(112, 128, 144)},
     {"skyblue", myRGB(114, 159, 255)},
     {"slateblue", myRGB(126, 136, 171)},
     {"slategray", myRGB(112, 128, 144)},


@@ -508,7 +505,7 @@ static rgbRecord theRGBRecords[] =
     {"yellowgreen", myRGB(50, 216, 56)},
     {NULL, myRGB(0, 0, 0)}
 };
     {"yellowgreen", myRGB(50, 216, 56)},
     {NULL, myRGB(0, 0, 0)}
 };

-static int numTheRGBRecords = 234;
+static int numTheRGBRecords = 235;

 
 static unsigned char ParseHexadecimal(char digit1, char digit2)
 {
 
 static unsigned char ParseHexadecimal(char digit1, char digit2)
 {


@@ -546,8 +543,8 @@ 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 = strdup(inname);


@@ -581,12 +578,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;


@@ -601,8 +598,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 )


@@ -657,7 +654,7 @@ struct wxXPMColourMapData
 {
     unsigned char R,G,B;
 };
 {
     unsigned char R,G,B;
 };

-WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap)
+WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap);

 
 wxImage wxXPMDecoder::ReadData(const char **xpm_data)
 {
 
 wxImage wxXPMDecoder::ReadData(const char **xpm_data)
 {


@@ -670,6 +667,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
     bool hasMask;
     wxXPMColourMapData clr_data;
     wxXPMColourMap clr_tbl;
     bool hasMask;
     wxXPMColourMapData clr_data;
     wxXPMColourMap clr_tbl;

+    wxXPMColourMap::iterator it;
+    wxString maskKey;

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


@@ -691,9 +690,9 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
     img.Create(width, height);
     if ( !img.Ok() ) return img;
 
     img.Create(width, height);
     if ( !img.Ok() ) return img;
 

-    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:


@@ -706,7 +705,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
 
         if ( clr_def == NULL )
         {
 
         if ( clr_def == NULL )
         {

-            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;
         }
         else
             clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
         }
         else


@@ -715,29 +715,43 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
             if ( !GetRGBFromName(clr_def, &isNone,
                                  &clr_data.R, &clr_data.G, &clr_data.B) )
             {
             if ( !GetRGBFromName(clr_def, &isNone,
                                  &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;
             }
             else
             {
                 if ( isNone )
                 {
                 clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;
             }
             else
             {
                 if ( isNone )
                 {

-                    img.SetMask(TRUE);
+                    img.SetMask(true);

                     img.SetMaskColour(255, 0, 255);
                     img.SetMaskColour(255, 0, 255);

-                    hasMask = TRUE;
+                    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
-                {
-                    if ( hasMask && clr_data.R == 255 &&
-                                    clr_data.G == 0 && clr_data.B == 255 )
-                        clr_data.B = 254;
+                    maskKey = key;

                 }
             }
         }
         clr_tbl[key] = clr_data;
     }
 
                 }
             }
         }
         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)
+            {
+                it->second.B = 254;
+            }
+        }
+    }
+

     /*
      *  Parse image data:
      */
     /*
      *  Parse image data:
      */


@@ -757,6 +771,12 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
             if ( entry == end )
             {
                 wxLogError(_("XPM: Malformed pixel data!"));
             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
             {