X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1af5934b54a758ad09bd17c13f0d3d2a38d16a77..4589ec39c0a8fb5268f577dfdeea2ccce7fb88d1:/src/common/imagbmp.cpp diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index f8552ff5a5..75e579a17b 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -450,6 +450,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, { wxInt32 aDword, rmask = 0, gmask = 0, bmask = 0; int rshift = 0, gshift = 0, bshift = 0; + int rbits = 0, gbits = 0, bbits = 0; wxInt32 dbuf[4]; wxInt8 bbuf[4]; wxUint8 aByte; @@ -529,11 +530,11 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, { int bit = 0; stream.Read(dbuf, 4 * 3); - bmask = wxINT32_SWAP_ON_BE(dbuf[0]); + rmask = wxINT32_SWAP_ON_BE(dbuf[0]); gmask = wxINT32_SWAP_ON_BE(dbuf[1]); - rmask = wxINT32_SWAP_ON_BE(dbuf[2]); - // find shift amount.. ugly, but i can't think of a better way: - for (bit = 0; bit < bpp; bit++) + bmask = wxINT32_SWAP_ON_BE(dbuf[2]); + // find shift amount (Least significant bit of mask) + for (bit = bpp-1; bit>=0; bit--) { if (bmask & (1 << bit)) bshift = bit; @@ -542,6 +543,16 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, if (rmask & (1 << bit)) rshift = bit; } + // Find number of bits in mask (MSB-LSB+1) + for (bit = 0; bit < bpp; bit++) + { + if (bmask & (1 << bit)) + bbits = bit-bshift+1; + if (gmask & (1 << bit)) + gbits = bit-gshift+1; + if (rmask & (1 << bit)) + rbits = bit-rshift+1; + } } else if ( bpp == 16 ) { @@ -551,6 +562,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, rshift = 10; gshift = 5; bshift = 0; + rbits = 5; + gbits = 5; + bbits = 5; } else if ( bpp == 32 ) { @@ -560,6 +574,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, rshift = 16; gshift = 8; bshift = 0; + rbits = 8; + gbits = 8; + bbits = 8; } } @@ -714,11 +731,15 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, stream.Read(&aWord, 2); aWord = wxUINT16_SWAP_ON_BE(aWord); linepos += 2; - temp = (aWord & rmask) >> rshift; + /* use the masks and calculated amonut of shift + 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); ptr[poffset] = temp; - temp = (aWord & gmask) >> gshift; + temp = (aWord & gmask) >> gshift << (8-gbits); ptr[poffset + 1] = temp; - temp = (aWord & bmask) >> bshift; + temp = (aWord & bmask) >> bshift << (8-bbits); ptr[poffset + 2] = temp; column++; } @@ -750,7 +771,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, image->SetMask(FALSE); - return stream.IsOk(); + return ( stream.LastError() == wxSTREAM_NO_ERROR || stream.LastError() == wxSTREAM_EOF ); } bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, @@ -876,9 +897,11 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream) { unsigned char hdr[2]; - stream.Read(hdr, 2); - stream.SeekI(-2, wxFromCurrent); - return (hdr[0] == 'B' && hdr[1] == 'M'); + if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) + return FALSE; + + // do we have the BMP file signature? + return hdr[0] == 'B' && hdr[1] == 'M'; } @@ -1196,13 +1219,13 @@ int wxICOHandler::GetImageCount(wxInputStream& stream) bool wxICOHandler::DoCanRead(wxInputStream& stream) { + stream.SeekI(0); unsigned char hdr[4]; - off_t iPos = stream.TellI(); - stream.SeekI (0); - stream.Read(hdr, 4); - stream.SeekI(iPos); - //hdr[2] is one for an icon and two for a cursor - return (hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0'); + if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) + return FALSE; + + // hdr[2] is one for an icon and two for a cursor + return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0'; } @@ -1215,13 +1238,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler) bool wxCURHandler::DoCanRead(wxInputStream& stream) { + stream.SeekI(0); unsigned char hdr[4]; - off_t iPos = stream.TellI(); - stream.SeekI (0); - stream.Read(hdr, 4); - stream.SeekI(iPos); - //hdr[2] is one for an icon and two for a cursor - return (hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0'); + if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) + return FALSE; + + // hdr[2] is one for an icon and two for a cursor + return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0'; } //----------------------------------------------------------------------------- @@ -1239,15 +1262,15 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream, static const char *listtxt = "LIST"; static const char *icotxt = "icon"; - wxInt32 *riff32 = (wxInt32 *) rifftxt; - wxInt32 *list32 = (wxInt32 *) listtxt; - wxInt32 *ico32 = (wxInt32 *) icotxt; + wxInt32 riff32 = (wxInt32) rifftxt; + wxInt32 list32 = (wxInt32) listtxt; + wxInt32 ico32 = (wxInt32) icotxt; int iIcon = 0; stream.SeekI(0); stream.Read(&FCC1, 4); - if ( FCC1 != *riff32 ) + if ( FCC1 != riff32 ) return FALSE; // we have a riff file: @@ -1256,21 +1279,23 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream, // we always have a data size stream.Read(&datalen, 4); datalen = wxINT32_SWAP_ON_BE(datalen) ; + //data should be padded to make even number of bytes + if (datalen % 2 == 1) datalen ++ ; //now either data or a FCC - if ( (FCC1 == *riff32) || (FCC1 == *list32) ) + if ( (FCC1 == riff32) || (FCC1 == list32) ) { - stream.Read(&FCC2, 4); + stream.Read(&FCC2, 4); } else { - if (FCC1 == *ico32 && iIcon >= index) + if (FCC1 == ico32 && iIcon >= index) { return DoLoadFile(image, stream, verbose, -1); } else { stream.SeekI(stream.TellI() + datalen); - if ( FCC1 == *ico32 ) + if ( FCC1 == ico32 ) iIcon ++; } } @@ -1289,27 +1314,31 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream) static const char *listtxt = "LIST"; static const char *anihtxt = "anih"; - wxInt32 *riff32 = (wxInt32 *) rifftxt; - wxInt32 *list32 = (wxInt32 *) listtxt; - wxInt32 *anih32 = (wxInt32 *) anihtxt; + wxInt32 riff32 = (wxInt32) rifftxt; + wxInt32 list32 = (wxInt32) listtxt; + wxInt32 anih32 = (wxInt32) anihtxt; stream.SeekI(0); - stream.Read(&FCC1, 4); - if ( FCC1 != *riff32 ) + if ( !stream.Read(&FCC1, 4) ) + return FALSE; + + if ( FCC1 != riff32 ) return FALSE; // we have a riff file: while ( stream.IsOk() ) { - if ( FCC1 == *anih32 ) + if ( FCC1 == anih32 ) return TRUE; // we always have a data size: stream.Read(&datalen, 4); - datalen = wxINT32_SWAP_ON_BE(datalen) ; + datalen = wxINT32_SWAP_ON_BE(datalen) ; + //data should be padded to make even number of bytes + if (datalen % 2 == 1) datalen ++ ; // now either data or a FCC: - if ( (FCC1 == *riff32) || (FCC1 == *list32) ) + if ( (FCC1 == riff32) || (FCC1 == list32) ) { - stream.Read(&FCC2, 4); + stream.Read(&FCC2, 4); } else { @@ -1317,7 +1346,11 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream) } // try to read next data chunk: - stream.Read(&FCC1, 4); + if ( !stream.Read(&FCC1, 4) ) + { + // reading failed -- either EOF or IO error, bail out anyhow + return FALSE; + } } return FALSE; @@ -1331,13 +1364,13 @@ int wxANIHandler::GetImageCount(wxInputStream& stream) static const char *listtxt = "LIST"; static const char *anihtxt = "anih"; - wxInt32 *riff32 = (wxInt32 *) rifftxt; - wxInt32 *list32 = (wxInt32 *) listtxt; - wxInt32 *anih32 = (wxInt32 *) anihtxt; + wxInt32 riff32 = (wxInt32) rifftxt; + wxInt32 list32 = (wxInt32) listtxt; + wxInt32 anih32 = (wxInt32) anihtxt; stream.SeekI(0); stream.Read(&FCC1, 4); - if ( FCC1 != *riff32 ) + if ( FCC1 != riff32 ) return wxNOT_FOUND; // we have a riff file: @@ -1346,14 +1379,16 @@ int wxANIHandler::GetImageCount(wxInputStream& stream) // we always have a data size: stream.Read(&datalen, 4); datalen = wxINT32_SWAP_ON_BE(datalen) ; + //data should be padded to make even number of bytes + if (datalen % 2 == 1) datalen ++ ; // now either data or a FCC: - if ( (FCC1 == *riff32) || (FCC1 == *list32) ) - { - stream.Read(&FCC2, 4); + if ( (FCC1 == riff32) || (FCC1 == list32) ) + { + stream.Read(&FCC2, 4); } else { - if ( FCC1 == *anih32 ) + if ( FCC1 == anih32 ) { wxUint32 *pData = new wxUint32[datalen/4]; stream.Read(pData, datalen);