/////////////////////////////////////////////////////////////////////////////
-// Name: xpmdecod.cpp
+// Name: src/common/xpmdecod.cpp
// Purpose: wxXPMDecoder
// Author: John Cristy, Vaclav Slavik
// RCS-ID: $Id$
* in this Software without prior written authorization from GROUPE BULL.
*/
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xpmdecod.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-# pragma hdrstop
+ #pragma hdrstop
#endif
+#if wxUSE_IMAGE && wxUSE_XPM
+
+#include "wx/xpmdecod.h"
+
#ifndef WX_PRECOMP
-# include "wx/defs.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/hashmap.h"
+ #include "wx/stream.h"
+ #include "wx/image.h"
#endif
-#if wxUSE_IMAGE && wxUSE_XPM
-
-#include "wx/stream.h"
-#include "wx/image.h"
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/hashmap.h"
-#include "wx/intl.h"
#include <string.h>
-
#include <ctype.h>
-#include "wx/xpmdecod.h"
-
#if wxUSE_STREAMS
bool wxXPMDecoder::CanRead(wxInputStream& stream)
{
return wxNullImage;
}
- xpm_lines = new const char*[lines_cnt];
+ xpm_lines = new const char*[lines_cnt + 1];
xpm_lines[0] = xpm_buffer;
line = 1;
for (p = xpm_buffer; (*p != '\0') && (line < lines_cnt); p++)
}
}
+ xpm_lines[lines_cnt] = NULL;
+
/*
* Read the image:
*/
struct wxXPMColourMapData
{
+ wxXPMColourMapData() { R = G = B = 0; }
unsigned char R,G,B;
};
WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap);
-wxImage wxXPMDecoder::ReadData(const char **xpm_data)
+wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
{
+ wxCHECK_MSG(xpm_data, wxNullImage, wxT("NULL XPM data") );
+
wxImage img;
int count;
unsigned width, height, colors_cnt, chars_per_pixel;
&width, &height, &colors_cnt, &chars_per_pixel);
if ( count != 4 || width * height * colors_cnt == 0 )
{
- wxLogError(_T("XPM: Not XPM data!"));
+ wxLogError(_("XPM: incorrect header format!"));
return wxNullImage;
}
// 8bit RGB...
wxCHECK_MSG(chars_per_pixel < 64, wxNullImage, wxT("XPM colormaps this large not supported."));
- img.Create(width, height);
- if ( !img.Ok() ) return img;
+ if ( !img.Create(width, height) )
+ return wxNullImage;
img.SetMask(false);
key[chars_per_pixel] = wxT('\0');
/*
* Create colour map:
*/
+ wxXPMColourMapData clr_data;
for (i = 0; i < colors_cnt; i++)
{
- wxXPMColourMapData clr_data = {255,0,255};
+ const char *xmpColLine = xpm_data[1 + i];
+
+ // we must have at least " x y" after the colour index, hence +5
+ if ( !xmpColLine || strlen(xmpColLine) < chars_per_pixel + 5 )
+ {
+ wxLogError(_("XPM: incorrect colour description in line %d"),
+ (int)(1 + i));
+ return wxNullImage;
+ }
for (i_key = 0; i_key < chars_per_pixel; i_key++)
- key[i_key] = (wxChar)xpm_data[1 + i][i_key];
- clr_def = ParseColor(xpm_data[1 + i] + chars_per_pixel);
+ key[i_key] = (wxChar)xmpColLine[i_key];
+ clr_def = ParseColor(xmpColLine + chars_per_pixel);
if ( clr_def == NULL )
{
- wxLogError(_("XPM: malformed colour definition '%s'!"),
- xpm_data[1+i]);
+ wxLogError(_("XPM: malformed colour definition '%s' at line %d!"),
+ xmpColLine, (int)(1 + i));
+ return wxNullImage;
}
- else
+
+ bool isNone = false;
+ if ( !GetRGBFromName(clr_def, &isNone,
+ &clr_data.R, &clr_data.G, &clr_data.B) )
{
- bool isNone = false;
- if ( !GetRGBFromName(clr_def, &isNone,
- &clr_data.R, &clr_data.G, &clr_data.B) )
- {
- wxLogError(_("XPM: malformed colour definition '%s'!"),
- xpm_data[1+i]);
- }
- else
- {
- if ( isNone )
- {
- img.SetMask(true);
- img.SetMaskColour(255, 0, 255);
- hasMask = true;
- maskKey = key;
- }
- }
+ wxLogError(_("XPM: malformed colour definition '%s' at line %d!"),
+ xmpColLine, (int)(1 + i));
+ return wxNullImage;
+ }
+
+ if ( isNone )
+ {
+ hasMask = true;
+ maskKey = key;
}
+
clr_tbl[key] = clr_data;
}
- /*
- * Modify colour entries with RGB = (255,0,255) to (255,0,254) if
- * mask colour is present (so that existing pixels with (255,0,255)
- * magenta colour are not incorrectly made transparent):
- */
+ // deal with the mask: we must replace pseudo-colour "None" with the mask
+ // colour (which can be any colour not otherwise used in the image)
if (hasMask)
{
- for (it = clr_tbl.begin(); it != clr_tbl.end(); ++it)
+ unsigned char r, g, b;
+ if ( !img.FindFirstUnusedColour(&r, &g, &b) )
{
- if (it->second.R == 255 && it->second.G == 0 &&
- it->second.B == 255 &&
- it->first != maskKey)
- {
- it->second.B = 254;
- }
+ wxLogError(_("XPM: no colors left to use for mask!"));
+ return wxNullImage;
}
+
+ clr_tbl[maskKey].R = r;
+ clr_tbl[maskKey].G = g;
+ clr_tbl[maskKey].B = b;
+
+ img.SetMask(true);
+ img.SetMaskColour(r, g, b);
}
/*
{
for (i = 0; i < width; i++, img_data += 3)
{
+ const char *xpmImgLine = xpm_data[1 + colors_cnt + j];
+ if ( !xpmImgLine || strlen(xpmImgLine) < width*chars_per_pixel )
+ {
+ wxLogError(_("XPM: truncated image data at line %d!"),
+ (int)(1 + colors_cnt + j));
+ return wxNullImage;
+ }
+
for (i_key = 0; i_key < chars_per_pixel; i_key++)
- key[i_key] = (wxChar)xpm_data[1 + colors_cnt + j]
- [chars_per_pixel * i + i_key];
+ {
+ key[i_key] = (wxChar)xpmImgLine[chars_per_pixel * i + i_key];
+ }
+
entry = clr_tbl.find(key);
if ( entry == end )
{
projects / wxWidgets.git / blobdiff