added wxUmaskChanger class and wxCHANGE_UMASK macro and use them instead of duplicati...

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index b637c66808410feb9e3ad29bc716811fb6298207..7da5a26011e57b88f24156c35808313d489d6928 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imagxpm.cpp
 // Purpose:     wxXPMHandler
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imagxpm.cpp
 // Purpose:     wxXPMHandler

-// Author:      Vaclav Slavik
+// Author:      Vaclav Slavik, Robert Roebling

 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence


@@ -62,7 +62,7 @@ license is as follows:
 %
 */
 
 %
 */
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "imagxpm.h"
 #endif
 
 #pragma implementation "imagxpm.h"
 #endif
 


@@ -77,14 +77,14 @@ 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/log.h"
 #include "wx/intl.h"
 #include "wx/utils.h"
 
 #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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 


@@ -94,63 +94,95 @@ IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
 
 #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))
+{
+    wxXPMDecoder decoder;
+
+    wxImage img = decoder.ReadFile(stream);
+    if ( !img.Ok() )
+        return false;
+    *image = img;
+    return true;
+}
+
+
+static char hexArray[] = "0123456789ABCDEF";
+
+static void DecToHex(int dec, char *buf)

 {
 {

-    if (verbose)
-        wxLogDebug(_("XPM: the handler is write-only!"));
-    return FALSE;
+    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,
 bool wxXPMHandler::SaveFile(wxImage * image,

-                            wxOutputStream& stream, bool verbose)
+                            wxOutputStream& stream, bool WXUNUSED(verbose))

 {
     wxString tmp;
     char tmp_c;
 {
     wxString tmp;
     char tmp_c;

-    
+

     // 1. count colours:
     #define MaxCixels  92
     // 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;
                          " .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:
     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"
+    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( (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,
+               "[] = {\n"

                "/* columns rows colors chars-per-pixel */\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);
                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();
     if (image->HasMask())
         mask_key = (image->GetMaskRed() << 16) |
                    (image->GetMaskGreen() << 8) | image->GetMaskBlue();

-    
+

     // 2b. generate colour table:
     // 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];
 


@@ -163,22 +195,27 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         }
         sym[j] = '\0';
 
         }
         sym[j] = '\0';
 

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

 
         if (key == 0)
 
         if (key == 0)

-            tmp.Printf(wxT("\"%s c Black\",\n"), sym);
+            sprintf( tmpbuf, "\"%s c Black\",\n", sym);

         else if (key == mask_key)
         else if (key == mask_key)

-            tmp.Printf(wxT("\"%s c None\",\n"), sym);
+            sprintf( tmpbuf, "\"%s c None\",\n", sym);

         else
         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");
     }
 
     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++)
 
     unsigned char *data = image->GetData();
     for (j = 0; j < image->GetHeight(); j++)


@@ -187,8 +224,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() )


@@ -198,24 +234,21 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         tmp_c = '\n'; stream.Write(&tmp_c, 1);
     }
     tmp = wxT("};\n");
         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;
 
     delete[] symbols;
     delete[] symbols_data;
 

-    return TRUE;
+    return true;

 }
 
 bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 {
 }
 
 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_STREAMS
 

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