Rewrote wxToolBar another time.

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 39689e1f5f53b35defe24846ff5d739a05b15725..c6ad6d6aa1408f643a44fc58b1eb52becb01d593 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -77,7 +77,7 @@ license is as follows:
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#if wxUSE_IMAGE && wxUSE_XPM
+#if wxUSE_XPM

 
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"
 
 #include "wx/imagxpm.h"
 #include "wx/wfstream.h"


@@ -96,7 +96,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
 bool wxXPMHandler::LoadFile(wxImage *image,
                             wxInputStream& stream,
 
 bool wxXPMHandler::LoadFile(wxImage *image,
                             wxInputStream& stream,

-                            bool verbose, int WXUNUSED(index))
+                            bool WXUNUSED(verbose), int WXUNUSED(index))

 {
     wxXPMDecoder decoder;
 
 {
     wxXPMDecoder decoder;
 


@@ -127,34 +127,49 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     for ( k = MaxCixels; cols > k; k *= MaxCixels)
         chars_per_pixel++;
 
     for ( k = MaxCixels; cols > k; k *= MaxCixels)
         chars_per_pixel++;
 

-    // 2. write the header:
-    tmp.Printf("/* XPM */\n"
-               "static char *xpm_data[] = {\n"
+    // 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.IsEmpty() )
+        sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
+    else 
+        sName = wxT("/* XPM */\nstatic char *xpm_data");
+    stream.Write(sName.c_str(), 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, 
+               "[] = {\n"

                "/* columns rows colors chars-per-pixel */\n"
                "\"%i %i %i %i\",\n",
                image->GetWidth(), image->GetHeight(), cols, chars_per_pixel);
                "/* columns rows colors chars-per-pixel */\n"
                "\"%i %i %i %i\",\n",
                image->GetWidth(), image->GetHeight(), cols, chars_per_pixel);

-    stream.Write(tmp.mb_str(), tmp.Length());
+    stream.Write(tmpbuf, strlen(tmpbuf));

 
     // 3. create color symbols table:
 
     // 3. create color symbols table:

-    wxHashTable table(wxKEY_INTEGER);
-    image->ComputeHistogram(table);
+    wxImageHistogram histogram;
+    image->ComputeHistogram(histogram);

 
     char *symbols_data = new char[cols * (chars_per_pixel+1)];
     char **symbols = new char*[cols];
 
     // 2a. find mask colour:
 
     char *symbols_data = new char[cols * (chars_per_pixel+1)];
     char **symbols = new char*[cols];
 
     // 2a. find mask colour:

-    long mask_key = -1;
+    unsigned long mask_key = 0x1000000 /*invalid RGB value*/;

     if (image->HasMask())
         mask_key = (image->GetMaskRed() << 16) |
                    (image->GetMaskGreen() << 8) | image->GetMaskBlue();
 
     // 2b. generate colour table:
     if (image->HasMask())
         mask_key = (image->GetMaskRed() << 16) |
                    (image->GetMaskGreen() << 8) | image->GetMaskBlue();
 
     // 2b. generate colour table:

-    table.BeginFind();
-    wxNode *node = NULL;
-    while ((node = table.Next()) != NULL)
+    for (wxImageHistogram::iterator entry = histogram.begin();
+         entry != histogram.end(); entry++ )

     {
     {

-        wxHNode *hnode = (wxHNode*) node->GetData();
-        long index = hnode->index;
+        unsigned long index = entry->second.index;

         symbols[index] = symbols_data + index * (chars_per_pixel+1);
         char *sym = symbols[index];
 
         symbols[index] = symbols_data + index * (chars_per_pixel+1);
         char *sym = symbols[index];
 


@@ -167,7 +182,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         }
         sym[j] = '\0';
 
         }
         sym[j] = '\0';
 

-        long key = node->GetKeyInteger();
+        unsigned long key = entry->first;

 
         if (key == 0)
             tmp.Printf(wxT("\"%s c Black\",\n"), sym);
 
         if (key == 0)
             tmp.Printf(wxT("\"%s c Black\",\n"), sym);


@@ -191,8 +206,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         for (i = 0; i < image->GetWidth(); i++, data += 3)
         {
             unsigned long key = (data[0] << 16) | (data[1] << 8) | (data[2]);
         for (i = 0; i < image->GetWidth(); i++, data += 3)
         {
             unsigned long key = (data[0] << 16) | (data[1] << 8) | (data[2]);

-            wxHNode *hnode = (wxHNode*) table.Get(key);
-            stream.Write(symbols[hnode->index], chars_per_pixel);
+            stream.Write(symbols[histogram[key].index], chars_per_pixel);

         }
         tmp_c = '\"'; stream.Write(&tmp_c, 1);
         if ( j + 1 < image->GetHeight() )
         }
         tmp_c = '\"'; stream.Write(&tmp_c, 1);
         if ( j + 1 < image->GetHeight() )


@@ -204,6 +218,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     tmp = wxT("};\n");
     stream.Write(tmp.mb_str(), 3);
 
     tmp = wxT("};\n");
     stream.Write(tmp.mb_str(), 3);
 

+    // Clean up:

     delete[] symbols;
     delete[] symbols_data;
 
     delete[] symbols;
     delete[] symbols_data;
 


@@ -218,4 +233,4 @@ bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 
 #endif  // wxUSE_STREAMS
 
 
 #endif  // wxUSE_STREAMS
 

-#endif // wxUSE_XPM && wxUSE_IMAGE
+#endif // wxUSE_XPM