X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c96ea65713a8dd58ae40b10718723b5c92a303e3..ab0d42f76d5594bd28fdcad35bedeb380902f3ea:/src/common/imagxpm.cpp?ds=sidebyside

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index b637c66808..c6ad6d6aa1 100644
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imagxpm.cpp
 // Purpose:     wxXPMHandler
-// Author:      Vaclav Slavik
+// Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence
@@ -77,14 +77,14 @@ license is as follows:
 #  include "wx/defs.h"
 #endif
 
-#if wxUSE_IMAGE && wxUSE_XPM
+#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)
 
@@ -94,63 +94,82 @@ IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
-bool wxXPMHandler::LoadFile(wxImage *WXUNUSED(image), 
-                            wxInputStream& WXUNUSED(stream), 
-                            bool verbose, int WXUNUSED(index))
+bool wxXPMHandler::LoadFile(wxImage *image,
+                            wxInputStream& stream,
+                            bool WXUNUSED(verbose), int WXUNUSED(index))
 {
-    if (verbose)
-        wxLogDebug(_("XPM: the handler is write-only!"));
-    return FALSE;
+    wxXPMDecoder decoder;
+
+    wxImage img = decoder.ReadFile(stream);
+    if ( !img.Ok() )
+        return FALSE;
+    *image = img;
+    return TRUE;
 }
 
 bool wxXPMHandler::SaveFile(wxImage * image,
-                            wxOutputStream& stream, bool verbose)
+                            wxOutputStream& stream, bool WXUNUSED(verbose))
 {
     wxString tmp;
     char tmp_c;
-    
+
     // 1. count colours:
     #define MaxCixels  92
-    static const char Cixel[MaxCixels+1] = 
+    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;
     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", 
+               "\"%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:
-    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:
-    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:
-    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];
 
@@ -163,14 +182,14 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         }
         sym[j] = '\0';
 
-        long key = node->GetKeyInteger();
+        unsigned long key = entry->first;
 
         if (key == 0)
             tmp.Printf(wxT("\"%s c Black\",\n"), sym);
         else if (key == mask_key)
             tmp.Printf(wxT("\"%s c None\",\n"), sym);
         else
-            tmp.Printf(wxT("\"%s c #%s%s%s\",\n"), sym, 
+            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());
@@ -187,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]);
-            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() )
@@ -199,7 +217,8 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     }
     tmp = wxT("};\n");
     stream.Write(tmp.mb_str(), 3);
-    
+
+    // Clean up:
     delete[] symbols;
     delete[] symbols_data;
 
@@ -208,14 +227,10 @@ bool wxXPMHandler::SaveFile(wxImage * image,
 
 bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 {
-    unsigned char buf[9];
-
-    stream.Read(buf, 9);
-    stream.SeekI(-9, wxFromCurrent);
-
-    return (memcmp(buf, "/* XPM */", 9) == 0);
+    wxXPMDecoder decoder;
+    return decoder.CanRead(stream);
 }
 
 #endif  // wxUSE_STREAMS
 
-#endif // wxUSE_XPM && wxUSE_IMAGE
+#endif // wxUSE_XPM