X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beb59f36c016d27cf8949eb8c0d38fc63ad536a..75a2645e11fe191cc812cd768b61322456b5f8b8:/src/common/imagbmp.cpp diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index e3e9cb67ad..6e4168e0f0 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -273,16 +273,16 @@ bool wxBMPHandler::SaveDib(wxImage *image, else if ( (format == wxBMP_8BPP_GREY) || (format == wxBMP_8BPP_RED) || (format == wxBMP_1BPP_BW) ) { - int i; rgbquad = new wxUint8 [palette_size*4]; - for (i = 0; i < palette_size; i++) + for ( int i = 0; i < palette_size; i++ ) { - // if 1BPP_BW then just 0 and 255 then exit - if (( i > 0) && (format == wxBMP_1BPP_BW)) i = 255; - rgbquad[i*4] = i; - rgbquad[i*4+1] = i; - rgbquad[i*4+2] = i; + // if 1BPP_BW then the value should be either 0 or 255 + wxUint8 c = (wxUint8)((i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i); + + rgbquad[i*4] = + rgbquad[i*4+1] = + rgbquad[i*4+2] = c; rgbquad[i*4+3] = 0; } } @@ -336,9 +336,9 @@ bool wxBMPHandler::SaveDib(wxImage *image, { pixel = 3*(y*width + x); #if wxUSE_PALETTE - buffer[x] = palette->GetPixel( data[pixel], - data[pixel+1], - data[pixel+2] ); + buffer[x] = (wxUint8)palette->GetPixel( data[pixel], + data[pixel+1], + data[pixel+2] ); #else // FIXME: what should this be? use some std palette maybe? buffer[x] = 0; @@ -370,7 +370,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, // fill buffer, ignore if > width #if wxUSE_PALETTE - buffer[x/2] = + buffer[x/2] = (wxUint8)( ((wxUint8)palette->GetPixel(data[pixel], data[pixel+1], data[pixel+2]) << 4) | @@ -378,7 +378,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, ? 0 : ((wxUint8)palette->GetPixel(data[pixel+3], data[pixel+4], - data[pixel+5]) )); + data[pixel+5]) )) ); #else // FIXME: what should this be? use some std palette maybe? buffer[x/2] = 0; @@ -392,14 +392,15 @@ bool wxBMPHandler::SaveDib(wxImage *image, pixel = 3*(y*width + x); #if wxUSE_PALETTE - buffer[x/8] = ((wxUint8)palette->GetPixel(data[pixel], data[pixel+1], data[pixel+2]) << 7) | + buffer[x/8] = (wxUint8)( + ((wxUint8)palette->GetPixel(data[pixel], data[pixel+1], data[pixel+2]) << 7) | (((x+1) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+3], data[pixel+4], data[pixel+5]) << 6)) | (((x+2) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+6], data[pixel+7], data[pixel+8]) << 5)) | (((x+3) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+9], data[pixel+10], data[pixel+11]) << 4)) | (((x+4) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+12], data[pixel+13], data[pixel+14]) << 3)) | (((x+5) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+15], data[pixel+16], data[pixel+17]) << 2)) | (((x+6) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+18], data[pixel+19], data[pixel+20]) << 1)) | - (((x+7) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+21], data[pixel+22], data[pixel+23]) )); + (((x+7) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+21], data[pixel+22], data[pixel+23]) )) ); #else // FIXME: what should this be? use some std palette maybe? buffer[x/8] = 0; @@ -412,7 +413,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, { pixel = 3*(y*width + x); - buffer[x/8] = + buffer[x/8] = (wxUint8)( (((wxUint8)(data[pixel] /128.)) << 7) | (((x+1) > width) ? 0 : (((wxUint8)(data[pixel+3] /128.)) << 6)) | (((x+2) > width) ? 0 : (((wxUint8)(data[pixel+6] /128.)) << 5)) | @@ -420,7 +421,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, (((x+4) > width) ? 0 : (((wxUint8)(data[pixel+12]/128.)) << 3)) | (((x+5) > width) ? 0 : (((wxUint8)(data[pixel+15]/128.)) << 2)) | (((x+6) > width) ? 0 : (((wxUint8)(data[pixel+18]/128.)) << 1)) | - (((x+7) > width) ? 0 : (((wxUint8)(data[pixel+21]/128.)) )); + (((x+7) > width) ? 0 : (((wxUint8)(data[pixel+21]/128.)) )) ); } } @@ -453,7 +454,7 @@ typedef struct bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, int bpp, int ncolors, int comp, - off_t bmpOffset, wxInputStream& stream, + wxFileOffset bmpOffset, wxInputStream& stream, bool verbose, bool IsBmp, bool hasPalette) { wxInt32 aDword, rmask = 0, gmask = 0, bmask = 0; @@ -517,9 +518,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, else { //used in reading .ico file mask - r[j] = cmap[j].r = j * 255; - g[j] = cmap[j].g = j * 255; - b[j] = cmap[j].b = j * 255; + r[j] = cmap[j].r = + g[j] = cmap[j].g = + b[j] = cmap[j].b = ( j ? 255 : 0 ); } } @@ -669,8 +670,8 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, { ++readBytes ; aByte = stream.GetC(); - nibble[0] = ( (aByte & 0xF0) >> 4 ) ; - nibble[1] = ( aByte & 0x0F ) ; + nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ; + nibble[1] = (wxUint8)( aByte & 0x0F ) ; } ptr[poffset ] = cmap[nibble[k%2]].r; ptr[poffset + 1] = cmap[nibble[k%2]].g; @@ -686,8 +687,8 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, else { wxUint8 nibble[2] ; - nibble[0] = ( (aByte & 0xF0) >> 4 ) ; - nibble[1] = ( aByte & 0x0F ) ; + nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ; + nibble[1] = (wxUint8)( aByte & 0x0F ) ; for ( int l = 0; l < first && column < width; l++ ) { @@ -797,11 +798,11 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, to retrieve the color data out of the word. Then shift it left by (8 - number of bits) such that the image has the proper dynamic range */ - temp = (aWord & rmask) >> rshift << (8-rbits); + temp = (unsigned char)((aWord & rmask) >> rshift << (8-rbits)); ptr[poffset] = temp; - temp = (aWord & gmask) >> gshift << (8-gbits); + temp = (unsigned char)((aWord & gmask) >> gshift << (8-gbits)); ptr[poffset + 1] = temp; - temp = (aWord & bmask) >> bshift << (8-bbits); + temp = (unsigned char)((aWord & bmask) >> bshift << (8-bbits)); ptr[poffset + 2] = temp; column++; } @@ -811,11 +812,11 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, stream.Read(&aDword, 4); aDword = wxINT32_SWAP_ON_BE(aDword); linepos += 4; - temp = (aDword & rmask) >> rshift; + temp = (unsigned char)((aDword & rmask) >> rshift); ptr[poffset] = temp; - temp = (aDword & gmask) >> gshift; + temp = (unsigned char)((aDword & gmask) >> gshift); ptr[poffset + 1] = temp; - temp = (aDword & bmask) >> bshift; + temp = (unsigned char)((aDword & bmask) >> bshift); ptr[poffset + 2] = temp; column++; } @@ -843,15 +844,15 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, wxUint16 aWord; wxInt32 dbuf[4]; wxInt8 bbuf[4]; - off_t offset; - offset = 0; // keep gcc quiet + wxFileOffset offset = 0; // keep gcc quiet if ( IsBmp ) { // read the header off the .BMP format file offset = stream.TellI(); - if (offset == wxInvalidOffset) offset = 0; + if (offset == wxInvalidOffset) + offset = 0; stream.Read(bbuf, 2); stream.Read(dbuf, 16); @@ -866,8 +867,8 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, offset = offset + wxINT32_SWAP_ON_BE(dbuf[2]); stream.Read(dbuf, 4 * 2); - int width = (int)wxINT32_SWAP_ON_BE(dbuf[0]); - int height = (int)wxINT32_SWAP_ON_BE(dbuf[1]); + int width = wxINT32_SWAP_ON_BE((int)dbuf[0]); + int height = wxINT32_SWAP_ON_BE((int)dbuf[1]); if ( !IsBmp)height = height / 2; // for icons divide by 2 if ( width > 32767 ) @@ -889,7 +890,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, int planes = (int)wxUINT16_SWAP_ON_BE( aWord ); */ stream.Read(&aWord, 2); - int bpp = (int)wxUINT16_SWAP_ON_BE(aWord); + int bpp = wxUINT16_SWAP_ON_BE((int)aWord); if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 ) { if (verbose) @@ -898,7 +899,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, } stream.Read(dbuf, 4 * 4); - int comp = (int)wxINT32_SWAP_ON_BE(dbuf[0]); + int comp = wxINT32_SWAP_ON_BE((int)dbuf[0]); if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS ) { @@ -908,7 +909,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, } stream.Read(dbuf, 4 * 2); - int ncolors = (int)wxINT32_SWAP_ON_BE( dbuf[0] ); + int ncolors = wxINT32_SWAP_ON_BE( (int)dbuf[0] ); if (ncolors == 0) ncolors = 1 << bpp; /* some more sanity checks */ @@ -1036,8 +1037,8 @@ bool wxICOHandler::SaveFile(wxImage *image, ICONDIR IconDir; IconDir.idReserved = 0; - IconDir.idType = wxUINT16_SWAP_ON_BE(type); - IconDir.idCount = wxUINT16_SWAP_ON_BE(images); + IconDir.idType = wxUINT16_SWAP_ON_BE((wxUint16)type); + IconDir.idCount = wxUINT16_SWAP_ON_BE((wxUint16)images); stream.Write(&IconDir.idReserved, sizeof(IconDir.idReserved)); stream.Write(&IconDir.idType, sizeof(IconDir.idType)); stream.Write(&IconDir.idCount, sizeof(IconDir.idCount)); @@ -1130,8 +1131,8 @@ bool wxICOHandler::SaveFile(wxImage *image, offset = offset + sizeof(ICONDIRENTRY); - icondirentry.bWidth = image->GetWidth(); - icondirentry.bHeight = 2 * image->GetHeight(); + icondirentry.bWidth = (wxUint8)image->GetWidth(); + icondirentry.bHeight = (wxUint8)(2 * image->GetHeight()); icondirentry.bColorCount = 0; icondirentry.bReserved = 0; icondirentry.wPlanes = wxUINT16_SWAP_ON_BE(1); @@ -1210,7 +1211,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, ICONDIR IconDir; - off_t iPos = stream.TellI(); + wxFileOffset iPos = stream.TellI(); stream.Read(&IconDir, sizeof(IconDir)); wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount); // nType is 1 for Icons, 2 for Cursors: @@ -1275,7 +1276,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, int wxICOHandler::GetImageCount(wxInputStream& stream) { ICONDIR IconDir; - off_t iPos = stream.TellI(); + wxFileOffset iPos = stream.TellI(); stream.SeekI(0); stream.Read(&IconDir, sizeof(IconDir)); wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);