X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8898456df4728afe7d100011e0e23b0ffb9a6341..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/common/imagxpm.cpp

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 843eddf654..17ec2b9143 100644
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -74,12 +74,13 @@ license is as follows:
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/utils.h"
 #endif
 
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
-#include "wx/utils.h"
 #include "wx/xpmdecod.h"
+#include "wx/filename.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
@@ -96,42 +97,65 @@ bool wxXPMHandler::LoadFile(wxImage *image,
     wxXPMDecoder decoder;
 
     wxImage img = decoder.ReadFile(stream);
-    if ( !img.Ok() )
+    if ( !img.IsOk() )
         return false;
     *image = img;
     return true;
 }
 
+namespace
+{
 
-static char hexArray[] = "0123456789ABCDEF";
-
-static void DecToHex(int dec, char *buf)
+// Make the given string a valid C identifier.
+//
+// All invalid characters are simply replaced by underscores and underscore is
+// also prepended in the beginning if the initial character is not alphabetic.
+void
+MakeValidCIdent(wxString* str)
 {
-    int firstDigit = (int)(dec/16.0);
-    int secondDigit = (int)(dec - (firstDigit*16.0));
-    buf[0] = hexArray[firstDigit];
-    buf[1] = hexArray[secondDigit];
-    buf[2] = 0;
+    const wxChar chUnderscore = wxT('_');
+
+    for ( wxString::iterator it = str->begin(); it != str->end(); ++it )
+    {
+        const wxChar ch = *it;
+        if ( wxIsdigit(ch) )
+        {
+            if ( it == str->begin() )
+            {
+                // Identifiers can't start with a digit.
+                str->insert(0, chUnderscore); // prepend underscore
+                it = str->begin(); // restart as string changed
+                continue;
+            }
+        }
+        else if ( !wxIsalpha(ch) && ch != chUnderscore )
+        {
+            // Not a valid character in C identifiers.
+            *it = chUnderscore;
+        }
+    }
+
+    // Double underscores are not allowed in normal C identifiers and are
+    // useless anyhow.
+    str->Replace(wxT("__"), wxT("_"));
 }
 
+} // anonymous namespace
 
 bool wxXPMHandler::SaveFile(wxImage * image,
                             wxOutputStream& stream, bool WXUNUSED(verbose))
 {
-    wxString tmp;
-    char tmp_c;
-
     // 1. count colours:
     #define MaxCixels  92
     static const char Cixel[MaxCixels+1] =
                          " .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjk"
                          "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|";
-    int chars_per_pixel;
-    int cols;
     int i, j, k;
 
-    cols = image->CountColours();
-    chars_per_pixel = 1;
+    wxImageHistogram histogram;
+    int cols = int(image->ComputeHistogram(histogram));
+
+    int chars_per_pixel = 1;
     for ( k = MaxCixels; cols > k; k *= MaxCixels)
         chars_per_pixel++;
 
@@ -139,15 +163,15 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     wxString sName;
     if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
     {
-        wxSplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
-                    NULL, &sName, NULL);
+        sName = wxFileName(image->GetOption(wxIMAGE_OPTION_FILENAME)).GetName();
+        MakeValidCIdent(&sName);
         sName << wxT("_xpm");
     }
 
     if ( !sName.empty() )
-        sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
+        sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName;
     else
-        sName = wxT("/* XPM */\nstatic char *xpm_data");
+        sName = wxT("/* XPM */\nstatic const char *xpm_data");
     stream.Write( (const char*) sName.ToAscii(), sName.Len() );
 
     char tmpbuf[200];
@@ -161,9 +185,6 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     stream.Write(tmpbuf, strlen(tmpbuf));
 
     // 3. create color symbols table:
-    wxImageHistogram histogram;
-    image->ComputeHistogram(histogram);
-
     char *symbols_data = new char[cols * (chars_per_pixel+1)];
     char **symbols = new char*[cols];
 
@@ -181,12 +202,10 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         symbols[index] = symbols_data + index * (chars_per_pixel+1);
         char *sym = symbols[index];
 
-        k = index % MaxCixels;
-        sym[0] = Cixel[k];
-        for (j = 1; j < chars_per_pixel; j++)
+        for (j = 0; j < chars_per_pixel; j++)
         {
-            k = ((index - k) / MaxCixels) % MaxCixels;
-            sym[j] = Cixel[k];
+            sym[j] = Cixel[index % MaxCixels];
+            index /= MaxCixels;
         }
         sym[j] = '\0';
 
@@ -198,23 +217,20 @@ bool wxXPMHandler::SaveFile(wxImage * image,
             sprintf( tmpbuf, "\"%s c None\",\n", sym);
         else
         {
-            char rbuf[3];
-            DecToHex( (unsigned char)(key >> 16), rbuf );
-            char gbuf[3];
-            DecToHex( (unsigned char)(key >> 8), gbuf );
-            char bbuf[3];
-            DecToHex( (unsigned char)(key), bbuf );
-            sprintf( tmpbuf, "\"%s c #%s%s%s\",\n", sym, rbuf, gbuf, bbuf );
+            wxByte r = wxByte(key >> 16);
+            wxByte g = wxByte(key >> 8);
+            wxByte b = wxByte(key);
+            sprintf(tmpbuf, "\"%s c #%02X%02X%02X\",\n", sym, r, g, b);
         }
         stream.Write( tmpbuf, strlen(tmpbuf) );
     }
 
-    tmp = wxT("/* pixels */\n");
-    stream.Write( (const char*) tmp.ToAscii(), tmp.length() );
+    stream.Write("/* pixels */\n", 13);
 
     unsigned char *data = image->GetData();
     for (j = 0; j < image->GetHeight(); j++)
     {
+        char tmp_c;
         tmp_c = '\"'; stream.Write(&tmp_c, 1);
         for (i = 0; i < image->GetWidth(); i++, data += 3)
         {
@@ -228,8 +244,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         }
         tmp_c = '\n'; stream.Write(&tmp_c, 1);
     }
-    tmp = wxT("};\n");
-    stream.Write( (const char*) tmp.ToAscii(), 3 );
+    stream.Write("};\n", 3 );
 
     // Clean up:
     delete[] symbols;
@@ -242,6 +257,7 @@ bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 {
     wxXPMDecoder decoder;
     return decoder.CanRead(stream);
+         // it's ok to modify the stream position here
 }
 
 #endif  // wxUSE_STREAMS