X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38755449339718307f594d0c92f7d37ce56c908c..e4315700228573d42a9afb1498fec4ee7b95ccb0:/src/common/xpmdecod.cpp?ds=sidebyside diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index 08ad872940..c4ad123d5c 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -114,6 +114,10 @@ license is as follows: #include "wx/intl.h" #include +#ifdef __VISUALC__ +#include +#endif + #include "wx/xpmdecod.h" #if wxUSE_STREAMS @@ -132,12 +136,13 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream) 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 *xpm_buffer = new char[length+1]; 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; + xpm_buffer[length] = '\0'; /* * Remove comments from the file: @@ -203,6 +208,12 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream) 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; @@ -222,7 +233,11 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream) wxImage img = ReadData(xpm_lines); delete[] xpm_buffer; +#ifdef __WIN16__ + delete[] (char**) xpm_lines; +#else delete[] xpm_lines; +#endif return img; } #endif // wxUSE_STREAMS @@ -491,6 +506,25 @@ static rgbRecord theRGBRecords[] = }; 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) { @@ -500,19 +534,15 @@ static bool GetRGBFromName(const char *inname, bool *isNone, 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; } @@ -544,41 +574,47 @@ static bool GetRGBFromName(const char *inname, bool *isNone, 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) @@ -624,8 +660,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data) 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; @@ -634,6 +670,7 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data) /* * Read hints and initialize structures: */ + count = sscanf(xpm_data[0], "%u %u %u %u", &width, &height, &colors_cnt, &chars_per_pixel); if ( count != 4 || width * height * colors_cnt == 0 ) @@ -651,7 +688,7 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data) 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); @@ -660,7 +697,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data) */ 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; @@ -707,9 +745,9 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data) { 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 ) { @@ -727,5 +765,4 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data) return img; } - #endif // wxUSE_IMAGE && wxUSE_XPM