# include "wx/defs.h"
#endif
-#if wxUSE_IMAGE && wxUSE_XPM
+#if wxUSE_XPM
#include "wx/imagxpm.h"
#include "wx/wfstream.h"
#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;
}
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"
+ 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,
+ "/* XPM */\n"
"static char *xpm_data[] = {\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);
if (image->HasMask())
mask_key = (image->GetMaskRed() << 16) |
(image->GetMaskGreen() << 8) | image->GetMaskBlue();
-
+
// 2b. generate colour table:
table.BeginFind();
wxNode *node = NULL;
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());
}
tmp = wxT("};\n");
stream.Write(tmp.mb_str(), 3);
-
+
+ // Clean up:
delete[] symbols;
delete[] symbols_data;
+ // FIXME: it will be better to use macros-based wxHashTable & DeleteContents(TRUE)
+ table.BeginFind();
+ while ((node = table.Next()) != NULL)
+ {
+ delete (wxHNode *) node->GetData();
+ }
+
return TRUE;
}
#endif // wxUSE_STREAMS
-#endif // wxUSE_XPM && wxUSE_IMAGE
+#endif // wxUSE_XPM