X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e548f6b13a27eee6f2740d922cab636f0b305e0..83498ef2b0a77944b3f7f3539b7bef6387c384a0:/src/common/quantize.cpp diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp index b89425443b..c230b983d9 100644 --- a/src/common/quantize.cpp +++ b/src/common/quantize.cpp @@ -77,7 +77,9 @@ typedef unsigned short UINT16; typedef signed short INT16; +#if !(defined(__WATCOMC__) && defined(__WXMSW__)) typedef signed int INT32; +#endif typedef unsigned char JSAMPLE; typedef JSAMPLE *JSAMPROW; @@ -1569,7 +1571,7 @@ bool wxQuantize::Quantize(const wxImage& src, wxImage& dest, // We need to shift the palette entries up // to make room for the Windows system colours. for (i = 0; i < w * h; i++) - data8bit[i] = data8bit[i] + paletteShift; + data8bit[i] = (unsigned char)(data8bit[i] + paletteShift); } #endif *eightBitData = data8bit; @@ -1654,4 +1656,3 @@ bool wxQuantize::Quantize(const wxImage& src, #endif // wxUSE_IMAGE -