X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/952ae1e88b9092f493b4ea6911a2b60b378d422d..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/common/imagxpm.cpp

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 7ebe0c9edf..3db566fcb7 100644
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagxpm.cpp
+// Name:        src/common/imagxpm.cpp
 // Purpose:     wxXPMHandler
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$
@@ -62,28 +62,23 @@ license is as follows:
 %
 */
 
-#ifdef __GNUG__
-#pragma implementation "imagxpm.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#  pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_XPM
+
 #ifndef WX_PRECOMP
-#  include "wx/defs.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/utils.h"
 #endif
 
-#if wxUSE_XPM
-
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/utils.h"
 #include "wx/xpmdecod.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
@@ -102,11 +97,24 @@ bool wxXPMHandler::LoadFile(wxImage *image,
 
     wxImage img = decoder.ReadFile(stream);
     if ( !img.Ok() )
-        return FALSE;
+        return false;
     *image = img;
-    return TRUE;
+    return true;
+}
+
+
+static char hexArray[] = "0123456789ABCDEF";
+
+static void DecToHex(int dec, char *buf)
+{
+    int firstDigit = (int)(dec/16.0);
+    int secondDigit = (int)(dec - (firstDigit*16.0));
+    buf[0] = hexArray[firstDigit];
+    buf[1] = hexArray[secondDigit];
+    buf[2] = 0;
 }
 
+
 bool wxXPMHandler::SaveFile(wxImage * image,
                             wxOutputStream& stream, bool WXUNUSED(verbose))
 {
@@ -128,12 +136,25 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         chars_per_pixel++;
 
     // 2. write the header:
+    wxString sName;
+    if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
+    {
+        wxSplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
+                    NULL, &sName, NULL);
+        sName << wxT("_xpm");
+    }
+
+    if ( !sName.empty() )
+        sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
+    else
+        sName = wxT("/* XPM */\nstatic char *xpm_data");
+    stream.Write( (const char*) sName.ToAscii(), sName.Len() );
+
     char tmpbuf[200];
     // VS: 200b is safe upper bound for anything produced by sprintf below
-    //     (101 bytes the string, neither %i can expand into more than 10 chars)
-    sprintf(tmpbuf, 
-               "/* XPM */\n"
-               "static char *xpm_data[] = {\n"
+    //     (<101 bytes the string, neither %i can expand into more than 10 chars)
+    sprintf(tmpbuf,
+               "[] = {\n"
                "/* columns rows colors chars-per-pixel */\n"
                "\"%i %i %i %i\",\n",
                image->GetWidth(), image->GetHeight(), cols, chars_per_pixel);
@@ -154,7 +175,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
 
     // 2b. generate colour table:
     for (wxImageHistogram::iterator entry = histogram.begin();
-         entry != histogram.end(); entry++ )
+         entry != histogram.end(); ++entry )
     {
         unsigned long index = entry->second.index;
         symbols[index] = symbols_data + index * (chars_per_pixel+1);
@@ -172,19 +193,24 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         unsigned long key = entry->first;
 
         if (key == 0)
-            tmp.Printf(wxT("\"%s c Black\",\n"), sym);
+            sprintf( tmpbuf, "\"%s c Black\",\n", sym);
         else if (key == mask_key)
-            tmp.Printf(wxT("\"%s c None\",\n"), sym);
+            sprintf( tmpbuf, "\"%s c None\",\n", sym);
         else
-            tmp.Printf(wxT("\"%s c #%s%s%s\",\n"), sym,
-                       wxDecToHex((unsigned char)(key >> 16)).c_str(),
-                       wxDecToHex((unsigned char)(key >> 8)).c_str(),
-                       wxDecToHex((unsigned char)(key)).c_str());
-        stream.Write(tmp.mb_str(), tmp.Length());
+        {
+            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 );
+        }
+        stream.Write( tmpbuf, strlen(tmpbuf) );
     }
 
     tmp = wxT("/* pixels */\n");
-    stream.Write(tmp.mb_str(), tmp.Length());
+    stream.Write( (const char*) tmp.ToAscii(), tmp.length() );
 
     unsigned char *data = image->GetData();
     for (j = 0; j < image->GetHeight(); j++)
@@ -203,13 +229,13 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         tmp_c = '\n'; stream.Write(&tmp_c, 1);
     }
     tmp = wxT("};\n");
-    stream.Write(tmp.mb_str(), 3);
+    stream.Write( (const char*) tmp.ToAscii(), 3 );
 
     // Clean up:
     delete[] symbols;
     delete[] symbols_data;
 
-    return TRUE;
+    return true;
 }
 
 bool wxXPMHandler::DoCanRead(wxInputStream& stream)