/////////////////////////////////////////////////////////////////////////////
-// Name: imagxpm.cpp
+// Name: src/common/imagxpm.cpp
// Purpose: wxXPMHandler
// Author: Vaclav Slavik, Robert Roebling
// RCS-ID: $Id$
%
*/
-#ifdef __GNUG__
-#pragma implementation "imagxpm.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#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_IMAGE && 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)
#if wxUSE_STREAMS
-bool wxXPMHandler::LoadFile(wxImage *image,
+bool wxXPMHandler::LoadFile(wxImage *image,
wxInputStream& stream,
- bool verbose, int WXUNUSED(index))
+ bool WXUNUSED(verbose), int WXUNUSED(index))
{
wxXPMDecoder decoder;
wxImage img = decoder.ReadFile(stream);
- if ( !img.Ok() )
- return FALSE;
+ if ( !img.IsOk() )
+ return false;
*image = img;
- return TRUE;
+ return true;
}
+namespace
+{
+
+// Make the given string a valid C identifier.
+//
+// All invalid characters are simply replaced by underscores and underscore is
+// also prepended in the beginning if the initial character is not alphabetic.
+void
+MakeValidCIdent(wxString* str)
+{
+ const wxChar chUnderscore = wxT('_');
+
+ for ( wxString::iterator it = str->begin(); it != str->end(); ++it )
+ {
+ const wxChar ch = *it;
+ if ( wxIsdigit(ch) )
+ {
+ if ( it == str->begin() )
+ {
+ // Identifiers can't start with a digit.
+ str->insert(0, chUnderscore); // prepend underscore
+ it = str->begin(); // restart as string changed
+ continue;
+ }
+ }
+ else if ( !wxIsalpha(ch) && ch != chUnderscore )
+ {
+ // Not a valid character in C identifiers.
+ *it = chUnderscore;
+ }
+ }
+
+ // Double underscores are not allowed in normal C identifiers and are
+ // useless anyhow.
+ str->Replace(wxT("__"), wxT("_"));
+}
+
+} // anonymous namespace
+
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;
+
+ wxImageHistogram histogram;
+ int cols = int(image->ComputeHistogram(histogram));
+
+ int 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) )
+ {
+ sName = wxFileName(image->GetOption(wxIMAGE_OPTION_FILENAME)).GetName();
+ MakeValidCIdent(&sName);
+ sName << wxT("_xpm");
+ }
+
+ if ( !sName.empty() )
+ sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName;
+ else
+ sName = wxT("/* XPM */\nstatic const 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"
- "\"%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);
-
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];
- 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';
- long key = node->GetKeyInteger();
+ unsigned long key = entry->first;
if (key == 0)
- tmp.Printf(wxT("\"%s c Black\",\n"), sym);
+ sprintf( tmpbuf, "\"%s c Black\",\n", sym);
else if (key == mask_key)
- tmp.Printf(wxT("\"%s c None\",\n"), sym);
+ sprintf( tmpbuf, "\"%s c None\",\n", sym);
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());
+ {
+ 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(tmp.mb_str(), 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)
{
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 = '\n'; stream.Write(&tmp_c, 1);
}
- tmp = wxT("};\n");
- stream.Write(tmp.mb_str(), 3);
-
+ stream.Write("};\n", 3 );
+
+ // Clean up:
delete[] symbols;
delete[] symbols_data;
- return TRUE;
+ return true;
}
bool wxXPMHandler::DoCanRead(wxInputStream& stream)
{
wxXPMDecoder decoder;
return decoder.CanRead(stream);
+ // it's ok to modify the stream position here
}
#endif // wxUSE_STREAMS
-#endif // wxUSE_XPM && wxUSE_IMAGE
+#endif // wxUSE_XPM
projects / wxWidgets.git / blobdiff