{
size_t length = stream.GetSize();
wxCHECK_MSG(length != 0, wxNullImage, wxT("Cannot read XPM from stream of unknown size"));
-
+
char *xpm_buffer = new char[length];
char *p, *q;
size_t i;
- if ( stream.Read(xpm_buffer, length).LastError() != wxSTREAM_NO_ERROR )
- return FALSE;
-
+ if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR )
+ return wxNullImage;
+
/*
* Remove comments from the file:
*/
i = 0;
for (p = xpm_buffer; *p != '\0'; p++)
{
- if ( *p != '"' )
+ if ( *p != '"' )
continue;
for (q = p + 1; *q != '\0'; q++)
if (*q == '"')
p = q + 1;
}
xpm_buffer[i] = '\0';
-
+
/*
* Create array of lines and convert \n's to \0's:
*/
const char **xpm_lines;
size_t lines_cnt = 0;
size_t line;
-
+
for (p = xpm_buffer; *p != '\0'; p++)
{
- if ( *p == '\n' )
+ if ( *p == '\n' )
lines_cnt++;
}
-
+
+ if ( !lines_cnt )
+ {
+ // this doesn't really look an XPM image
+ return wxNullImage;
+ }
+
xpm_lines = new const char*[lines_cnt];
xpm_lines[0] = xpm_buffer;
line = 1;
for (p = xpm_buffer; (*p != '\0') && (line < lines_cnt); p++)
{
- if ( *p == '\n' )
+ if ( *p == '\n' )
{
xpm_lines[line] = p + 1;
*p = '\0';
line++;
}
}
-
+
/*
* Read the image:
*/
wxImage img = ReadData(xpm_lines);
-
+
delete[] xpm_buffer;
+#ifdef __WIN16__
+ delete[] (char**) xpm_lines;
+#else
delete[] xpm_lines;
+#endif
return img;
}
#endif // wxUSE_STREAMS
\*****************************************************************************/
-typedef struct
+typedef struct
{
char *name;
wxUint32 rgb;
};
static int numTheRGBRecords = 234;
+static unsigned char ParseHexadecimal(char digit1, char digit2)
+{
+ unsigned char i1, i2;
+
+ if (digit1 >= 'a')
+ i1 = digit1 - 'a' + 0x0A;
+ else if (digit1 >= 'A')
+ i1 = digit1 - 'A' + 0x0A;
+ else
+ i1 = digit1 - '0';
+ if (digit2 >= 'a')
+ i2 = digit2 - 'a' + 0x0A;
+ else if (digit2 >= 'A')
+ i2 = digit2 - 'A' + 0x0A;
+ else
+ i2 = digit2 - '0';
+ return (0x10 * i1 + i2);
+}
+
static bool GetRGBFromName(const char *inname, bool *isNone,
unsigned char *r, unsigned char*g, unsigned char *b)
{
char *name;
char *grey, *p;
- // #rrggbb are not in database, we parse them directly
- if ( *inname == '#' && strlen(inname) == 7 )
+ // Neither #rrggbb nor #rrrrggggbbbb are in database, we parse them directly
+ size_t inname_len = strlen(inname);
+ if ( *inname == '#' && (inname_len == 7 || inname_len == 13))
{
- char buf[3];
- buf[2] = 0;
- buf[0] = inname[1]; buf[1] = inname[2];
- *r = (unsigned char) wxHexToDec(buf);
- buf[0] = inname[3]; buf[1] = inname[4];
- *g = (unsigned char) wxHexToDec(buf);
- buf[0] = inname[5]; buf[1] = inname[6];
- *b = (unsigned char) wxHexToDec(buf);
+ size_t ofs = (inname_len == 7) ? 2 : 4;
+ *r = ParseHexadecimal(inname[1], inname[2]);
+ *g = ParseHexadecimal(inname[1*ofs+1], inname[1*ofs+2]);
+ *b = ParseHexadecimal(inname[2*ofs+1], inname[2*ofs+2]);
*isNone = FALSE;
-
return TRUE;
}
// lot of gray...
// so first extract ' '
- while ((p = strchr(name, ' ')))
+ while ((p = strchr(name, ' ')) != NULL)
{
while (*(p)) // till eof of string
{
}
// fold to lower case
p = name;
- while (*p)
+ while (*p)
{
*p = tolower(*p);
p++;
// substitute Grey with Gray, else rgbtab.h would have more than 100
// 'duplicate' entries
- if ( (grey = strstr(name, "grey")) )
+ if ( (grey = strstr(name, "grey")) != NULL )
grey[2] = 'a';
// check for special 'none' colour:
+ bool found;
if ( strcmp(name, "none") == 0 )
{
*isNone = TRUE;
- return TRUE;
+ found = TRUE;
}
-
- // binary search:
- left = 0;
- right = numTheRGBRecords - 1;
- do
+ else // not "None"
{
- middle = (left + right) / 2;
- cmp = strcmp(name, theRGBRecords[middle].name);
- if ( cmp == 0 )
- {
- rgbVal = theRGBRecords[middle].rgb;
- *r = (rgbVal >> 16) & 0xFF;
- *g = (rgbVal >> 8) & 0xFF;
- *b = (rgbVal) & 0xFF;
- *isNone = FALSE;
- free(name);
- return TRUE;
- }
- else if ( cmp < 0 )
+ found = FALSE;
+
+ // binary search:
+ left = 0;
+ right = numTheRGBRecords - 1;
+ do
{
- right = middle - 1;
- }
- else
- { // > 0
- left = middle + 1;
- }
- } while (left <= right);
+ middle = (left + right) / 2;
+ cmp = strcmp(name, theRGBRecords[middle].name);
+ if ( cmp == 0 )
+ {
+ rgbVal = theRGBRecords[middle].rgb;
+ *r = (unsigned char)((rgbVal >> 16) & 0xFF);
+ *g = (unsigned char)((rgbVal >> 8) & 0xFF);
+ *b = (unsigned char)((rgbVal) & 0xFF);
+ *isNone = FALSE;
+ found = TRUE;
+ break;
+ }
+ else if ( cmp < 0 )
+ {
+ right = middle - 1;
+ }
+ else // cmp > 0
+ {
+ left = middle + 1;
+ }
+ } while (left <= right);
+ }
free(name);
- return FALSE;
+
+ return found;
}
static const char *ParseColor(const char *data)
{
- static const char *targets[] =
+ static const char *targets[] =
{"c ", "g ", "g4 ", "m ", "b ", "s ", NULL};
const char *p, *r;
wxImage img;
int count;
unsigned width, height, colors_cnt, chars_per_pixel;
- unsigned i, j;
- char key[64];
+ size_t i, j, i_key;
+ wxChar key[64];
const char *clr_def;
bool hasMask;
wxXPMColourMapData *clr_data;
wxHashTable clr_tbl(wxKEY_STRING);
-
+
/*
* Read hints and initialize structures:
*/
- count = sscanf(xpm_data[0], "%u %u %u %u",
+
+ count = sscanf(xpm_data[0], "%u %u %u %u",
&width, &height, &colors_cnt, &chars_per_pixel);
if ( count != 4 || width * height * colors_cnt == 0 )
{
// 92 possible values on each position, 92^64 is *way* larger space than
// 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;
img.SetMask(FALSE);
- key[chars_per_pixel] = '\0';
+ key[chars_per_pixel] = wxT('\0');
hasMask = FALSE;
clr_tbl.DeleteContents(TRUE);
-
+
/*
* Create colour map:
*/
for (i = 0; i < colors_cnt; i++)
{
- memcpy(key, xpm_data[1 + i], chars_per_pixel);
+ 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]);
clr_data = new wxXPMColourMapData;
else
{
bool isNone;
- if ( !GetRGBFromName(clr_def, &isNone,
+ 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 ( hasMask && clr_data->R == 255 &&
+ if ( hasMask && clr_data->R == 255 &&
clr_data->G == 0 && clr_data->B == 255 )
clr_data->B = 254;
}
/*
* Parse image data:
*/
-
+
unsigned char *img_data = img.GetData();
for (j = 0; j < height; j++)
{
for (i = 0; i < width; i++, img_data += 3)
{
- memcpy(key,
- xpm_data[1 + colors_cnt + j] + chars_per_pixel * i,
- chars_per_pixel);
+ 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];
clr_data = (wxXPMColourMapData*) clr_tbl.Get(key);
if ( clr_data == NULL )
{
return img;
}
-
#endif // wxUSE_IMAGE && wxUSE_XPM
projects / wxWidgets.git / blobdiff