Remove fixed size of gs_encodingNames array in font mapper code.

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 5bf4ec4af3beaee56f838564fe14cdfd28e6bba8..2850e770e61d616ea871e434897134934b43cddd 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -80,6 +80,7 @@ license is as follows:
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
 #include "wx/xpmdecod.h"
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
 #include "wx/xpmdecod.h"

+#include "wx/filename.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 


@@ -102,36 +103,20 @@ bool wxXPMHandler::LoadFile(wxImage *image,
     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))
 {
 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!~^/()_`'][{}|";
     // 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;
 
     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++;
 
     for ( k = MaxCixels; cols > k; k *= MaxCixels)
         chars_per_pixel++;
 


@@ -139,15 +124,15 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     wxString sName;
     if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
     {
     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.empty() )
         sName << wxT("_xpm");
     }
 
     if ( !sName.empty() )

-        sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
+        sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName;

     else
     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];
     stream.Write( (const char*) sName.ToAscii(), sName.Len() );
 
     char tmpbuf[200];


@@ -161,9 +146,6 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     stream.Write(tmpbuf, strlen(tmpbuf));
 
     // 3. create color symbols table:
     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];
 
     char *symbols_data = new char[cols * (chars_per_pixel+1)];
     char **symbols = new char*[cols];
 


@@ -196,23 +178,20 @@ bool wxXPMHandler::SaveFile(wxImage * image,
             sprintf( tmpbuf, "\"%s c None\",\n", sym);
         else
         {
             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) );
     }
 
         }
         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++)
     {
 
     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)
         {
         tmp_c = '\"'; stream.Write(&tmp_c, 1);
         for (i = 0; i < image->GetWidth(); i++, data += 3)
         {


@@ -226,8 +205,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         }
         tmp_c = '\n'; stream.Write(&tmp_c, 1);
     }
         }
         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;
 
     // Clean up:
     delete[] symbols;


@@ -240,6 +218,7 @@ bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 {
     wxXPMDecoder decoder;
     return decoder.CanRead(stream);
 {
     wxXPMDecoder decoder;
     return decoder.CanRead(stream);

+         // it's ok to modify the stream position here

 }
 
 #endif  // wxUSE_STREAMS
 }
 
 #endif  // wxUSE_STREAMS