/////////////////////////////////////////////////////////////////////////////
-// Name: imagxpm.cpp
+// Name: src/common/imagxpm.cpp
// Purpose: wxXPMHandler
// Author: Vaclav Slavik, Robert Roebling
// RCS-ID: $Id$
%
*/
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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_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)
wxXPMDecoder decoder;
wxImage img = decoder.ReadFile(stream);
- if ( !img.Ok() )
+ if ( !img.IsOk() )
return false;
*image = img;
return true;
}
+namespace
+{
-static char hexArray[] = "0123456789ABCDEF";
-
-static void DecToHex(int dec, char *buf)
+// 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)
{
- int firstDigit = (int)(dec/16.0);
- int secondDigit = (int)(dec - (firstDigit*16.0));
- buf[0] = hexArray[firstDigit];
- buf[1] = hexArray[secondDigit];
- buf[2] = 0;
+ 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 WXUNUSED(verbose))
{
- wxString tmp;
- char tmp_c;
-
// 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;
- 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++;
wxString sName;
if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
{
- wxSplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
- NULL, &sName, NULL);
+ sName = wxFileName(image->GetOption(wxIMAGE_OPTION_FILENAME)).GetName();
+ MakeValidCIdent(&sName);
sName << wxT("_xpm");
}
- if ( !sName.IsEmpty() )
- sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
+ if ( !sName.empty() )
+ sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName;
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(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];
// 2b. generate colour table:
for (wxImageHistogram::iterator entry = histogram.begin();
- entry != histogram.end(); entry++ )
+ entry != histogram.end(); ++entry )
{
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';
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) );
}
- 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++)
{
+ char tmp_c;
tmp_c = '\"'; stream.Write(&tmp_c, 1);
for (i = 0; i < image->GetWidth(); i++, data += 3)
{
}
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;
{
wxXPMDecoder decoder;
return decoder.CanRead(stream);
+ // it's ok to modify the stream position here
}
#endif // wxUSE_STREAMS
projects / wxWidgets.git / blobdiff