X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..396b37294a8c37739d71535783ae5c54d5f12f70:/src/common/imagxpm.cpp

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index aa511c7359..de2530e84c 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$
@@ -66,21 +66,21 @@ license is as follows:
 #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"
+#include "wx/filename.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
@@ -97,42 +97,26 @@ bool wxXPMHandler::LoadFile(wxImage *image,
     wxXPMDecoder decoder;
 
     wxImage img = decoder.ReadFile(stream);
-    if ( !img.Ok() )
+    if ( !img.IsOk() )
         return false;
     *image = img;
     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))
 {
-    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++;
 
@@ -140,15 +124,15 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     wxString sName;
     if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
     {
-        wxSplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
-                    NULL, &sName, NULL);
+        wxFileName::SplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
+                              NULL, &sName, NULL);
         sName << wxT("_xpm");
     }
 
-    if ( !sName.IsEmpty() )
-        sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
+    if ( !sName.empty() )
+        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];
@@ -162,9 +146,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];
 
@@ -182,12 +163,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';
 
@@ -199,23 +178,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)
         {
@@ -229,8 +205,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;
@@ -243,6 +218,7 @@ bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 {
     wxXPMDecoder decoder;
     return decoder.CanRead(stream);
+         // it's ok to modify the stream position here
 }
 
 #endif  // wxUSE_STREAMS