X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1af5934b54a758ad09bd17c13f0d3d2a38d16a77..b765da9f5090ef076302eb0d12cfc11b61296430:/src/common/imagbmp.cpp?ds=sidebyside diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index f8552ff5a5..d9448c9035 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -7,7 +7,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "imagbmp.h" #endif @@ -20,7 +20,7 @@ #include "wx/defs.h" -#if wxUSE_IMAGE && wxUSE_STREAMS +#if wxUSE_IMAGE #include "wx/imagbmp.h" #include "wx/bitmap.h" @@ -43,7 +43,7 @@ #endif #ifdef __WXMSW__ -#include +#include "wx/msw/wrapwin.h" #endif //----------------------------------------------------------------------------- @@ -52,9 +52,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler) +#if wxUSE_STREAMS + #ifndef BI_RGB -#define BI_RGB 0 + #define BI_RGB 0 +#endif + +#ifndef BI_RLE8 #define BI_RLE8 1 +#endif + +#ifndef BI_RLE4 #define BI_RLE4 2 #endif @@ -450,13 +458,14 @@ 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; wxUint16 aWord; // allocate space for palette if needed: - _cmap *cmap = NULL; + _cmap *cmap; if ( bpp < 16 ) { @@ -529,11 +538,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 +551,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 +570,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 +582,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, rshift = 16; gshift = 8; bshift = 0; + rbits = 8; + gbits = 8; + bbits = 8; } } @@ -583,27 +608,23 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, ptr = data; } - int line = 0; - int column = 0; int linesize = ((width * bpp + 31) / 32) * 4; /* BMPs are stored upside down */ - for ( line = (height - 1); line >= 0; line-- ) + for ( int line = (height - 1); line >= 0; line-- ) { int linepos = 0; - for ( column = 0; column < width; ) + for ( int column = 0; column < width ; ) { if ( bpp < 16 ) { - int index = 0; linepos++; aByte = stream.GetC(); if ( bpp == 1 ) { - int bit = 0; - for (bit = 0; bit < 8 && column < width; bit++) + for (int bit = 0; bit < 8 && column < width; bit++) { - index = ((aByte & (0x80 >> bit)) ? 1 : 0); + int index = ((aByte & (0x80 >> bit)) ? 1 : 0); ptr[poffset] = cmap[index].r; ptr[poffset + 1] = cmap[index].g; ptr[poffset + 2] = cmap[index].b; @@ -614,18 +635,76 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, { if ( comp == BI_RLE4 ) { - if ( verbose ) - wxLogError(_("DIB Header: Cannot deal with 4bit encoded yet.")); - image->Destroy(); - delete[] cmap; - return FALSE; + wxUint8 first; + first = aByte; + aByte = stream.GetC(); + if ( first == 0 ) + { + if ( aByte == 0 ) + { + if ( column > 0 ) + column = width; + } + else if ( aByte == 1 ) + { + column = width; + line = -1; + } + else if ( aByte == 2 ) + { + aByte = stream.GetC(); + column += aByte; + linepos = column * bpp / 4; + aByte = stream.GetC(); + line -= aByte; // upside down + } + else + { + int absolute = aByte; + wxUint8 nibble[2] ; + int readBytes = 0 ; + for (int k = 0; k < absolute; k++) + { + if ( !(k % 2 ) ) + { + ++readBytes ; + aByte = stream.GetC(); + nibble[0] = ( (aByte & 0xF0) >> 4 ) ; + nibble[1] = ( aByte & 0x0F ) ; + } + ptr[poffset ] = cmap[nibble[k%2]].r; + ptr[poffset + 1] = cmap[nibble[k%2]].g; + ptr[poffset + 2] = cmap[nibble[k%2]].b; + column++; + if ( k % 2 ) + linepos++; + } + if ( readBytes & 0x01 ) + aByte = stream.GetC(); + } + } + else + { + wxUint8 nibble[2] ; + nibble[0] = ( (aByte & 0xF0) >> 4 ) ; + nibble[1] = ( aByte & 0x0F ) ; + + for ( int l = 0; l < first && column < width; l++ ) + { + ptr[poffset ] = cmap[nibble[l%2]].r; + ptr[poffset + 1] = cmap[nibble[l%2]].g; + ptr[poffset + 2] = cmap[nibble[l%2]].b; + column++; + if ( l % 2 ) + linepos++; + } + } } else { - int nibble = 0; - for (nibble = 0; nibble < 2 && column < width; nibble++) + for (int nibble = 0; nibble < 2 && column < width; nibble++) { - index = ((aByte & (0xF0 >> nibble * 4)) >> (!nibble * 4)); + int index = ((aByte & (0xF0 >> nibble * 4)) >> (!nibble * 4)); if ( index >= 16 ) index = 15; ptr[poffset] = cmap[index].r; @@ -698,59 +777,64 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, // linepos += size; seems to be wrong, RR } } - } - else if ( bpp == 24 ) - { - stream.Read(bbuf, 3); - linepos += 3; - ptr[poffset ] = (unsigned char)bbuf[2]; - ptr[poffset + 1] = (unsigned char)bbuf[1]; - ptr[poffset + 2] = (unsigned char)bbuf[0]; - column++; - } - else if ( bpp == 16 ) - { - unsigned char temp; - stream.Read(&aWord, 2); - aWord = wxUINT16_SWAP_ON_BE(aWord); - linepos += 2; - temp = (aWord & rmask) >> rshift; - ptr[poffset] = temp; - temp = (aWord & gmask) >> gshift; - ptr[poffset + 1] = temp; - temp = (aWord & bmask) >> bshift; - ptr[poffset + 2] = temp; - column++; - } - else - { - unsigned char temp; - stream.Read(&aDword, 4); - aDword = wxINT32_SWAP_ON_BE(aDword); - linepos += 4; - temp = (aDword & rmask) >> rshift; - ptr[poffset] = temp; - temp = (aDword & gmask) >> gshift; - ptr[poffset + 1] = temp; - temp = (aDword & bmask) >> bshift; - ptr[poffset + 2] = temp; - column++; - } - } - while ( (linepos < linesize) && (comp != 1) && (comp != 2) ) - { - stream.Read(&aByte, 1); - linepos += 1; - if ( stream.LastError() != wxStream_NOERROR ) - break; - } - } - if (cmap) - delete[] cmap; - - image->SetMask(FALSE); - - return stream.IsOk(); + } + else if ( bpp == 24 ) + { + stream.Read(bbuf, 3); + linepos += 3; + ptr[poffset ] = (unsigned char)bbuf[2]; + ptr[poffset + 1] = (unsigned char)bbuf[1]; + ptr[poffset + 2] = (unsigned char)bbuf[0]; + column++; + } + else if ( bpp == 16 ) + { + unsigned char temp; + stream.Read(&aWord, 2); + aWord = wxUINT16_SWAP_ON_BE(aWord); + linepos += 2; + /* 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 << (8-gbits); + ptr[poffset + 1] = temp; + temp = (aWord & bmask) >> bshift << (8-bbits); + ptr[poffset + 2] = temp; + column++; + } + else + { + unsigned char temp; + stream.Read(&aDword, 4); + aDword = wxINT32_SWAP_ON_BE(aDword); + linepos += 4; + temp = (aDword & rmask) >> rshift; + ptr[poffset] = temp; + temp = (aDword & gmask) >> gshift; + ptr[poffset + 1] = temp; + temp = (aDword & bmask) >> bshift; + ptr[poffset + 2] = temp; + column++; + } + } + while ( (linepos < linesize) && (comp != 1) && (comp != 2) ) + { + stream.Read(&aByte, 1); + linepos += 1; + if ( !stream ) + break; + } + } + + delete[] cmap; + + image->SetMask(FALSE); + + const wxStreamError err = stream.GetLastError(); + return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF; } bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, @@ -876,11 +960,15 @@ 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'; } +#endif // wxUSE_STREAMS + #if wxUSE_ICO_CUR //----------------------------------------------------------------------------- @@ -889,6 +977,8 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream) IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler) +#if wxUSE_STREAMS + struct ICONDIRENTRY { wxUint8 bWidth; // Width of the image @@ -918,7 +1008,6 @@ bool wxICOHandler::SaveFile(wxImage *image, bool verbose) { - bool bResult = FALSE; //sanity check; icon must be less than 127 pixels high and 255 wide if ( image->GetHeight () > 127 ) { @@ -1010,7 +1099,7 @@ bool wxICOHandler::SaveFile(wxImage *image, //calculate size and offset of image and mask wxCountingOutputStream cStream; - bResult = SaveDib(image, cStream, verbose, IsBmp, IsMask); + bool bResult = SaveDib(image, cStream, verbose, IsBmp, IsMask); if ( !bResult ) { if ( verbose ) @@ -1116,8 +1205,8 @@ bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream, bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, bool WXUNUSED(verbose), int index) { - bool bResult = FALSE; - bool IsBmp = FALSE; + bool bResult wxDUMMY_INITIALIZE(false); + bool IsBmp = false; ICONDIR IconDir; @@ -1163,7 +1252,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons ) { wxLogError(_("ICO: Invalid icon index.")); - bResult = FALSE; + bResult = false; } else { @@ -1196,15 +1285,16 @@ 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'; } +#endif // wxUSE_STREAMS //----------------------------------------------------------------------------- @@ -1213,41 +1303,46 @@ bool wxICOHandler::DoCanRead(wxInputStream& stream) IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler) +#if wxUSE_STREAMS + 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'; } +#endif // wxUSE_STREAMS + //----------------------------------------------------------------------------- // wxANIHandler //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler) +#if wxUSE_STREAMS + bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, int index) { wxInt32 FCC1, FCC2; wxUint32 datalen; - static const char *rifftxt = "RIFF"; - static const char *listtxt = "LIST"; - static const char *icotxt = "icon"; - - wxInt32 *riff32 = (wxInt32 *) rifftxt; - wxInt32 *list32 = (wxInt32 *) listtxt; - wxInt32 *ico32 = (wxInt32 *) icotxt; + wxInt32 riff32; + memcpy( &riff32, "RIFF", 4 ); + wxInt32 list32; + memcpy( &list32, "LIST", 4 ); + wxInt32 ico32; + memcpy( &ico32, "icon", 4 ); 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 +1351,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 ++; } } @@ -1285,31 +1382,37 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream) { wxInt32 FCC1, FCC2; wxUint32 datalen ; - static const char *rifftxt = "RIFF"; - static const char *listtxt = "LIST"; - static const char *anihtxt = "anih"; - - wxInt32 *riff32 = (wxInt32 *) rifftxt; - wxInt32 *list32 = (wxInt32 *) listtxt; - wxInt32 *anih32 = (wxInt32 *) anihtxt; - + + wxInt32 riff32; + memcpy( &riff32, "RIFF", 4 ); + wxInt32 list32; + memcpy( &list32, "LIST", 4 ); + wxInt32 ico32; + memcpy( &ico32, "icon", 4 ); + wxInt32 anih32; + memcpy( &anih32, "anih", 4 ); + 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 +1420,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; @@ -1327,17 +1434,19 @@ int wxANIHandler::GetImageCount(wxInputStream& stream) { wxInt32 FCC1, FCC2; wxUint32 datalen ; - static const char *rifftxt = "RIFF"; - static const char *listtxt = "LIST"; - static const char *anihtxt = "anih"; - - wxInt32 *riff32 = (wxInt32 *) rifftxt; - wxInt32 *list32 = (wxInt32 *) listtxt; - wxInt32 *anih32 = (wxInt32 *) anihtxt; + wxInt32 riff32; + memcpy( &riff32, "RIFF", 4 ); + wxInt32 list32; + memcpy( &list32, "LIST", 4 ); + wxInt32 ico32; + memcpy( &ico32, "icon", 4 ); + wxInt32 anih32; + memcpy( &anih32, "anih", 4 ); + stream.SeekI(0); stream.Read(&FCC1, 4); - if ( FCC1 != *riff32 ) + if ( FCC1 != riff32 ) return wxNOT_FOUND; // we have a riff file: @@ -1346,14 +1455,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); @@ -1372,6 +1483,8 @@ int wxANIHandler::GetImageCount(wxInputStream& stream) return wxNOT_FOUND; } +#endif // wxUSE_STREAMS + #endif // wxUSE_ICO_CUR -#endif // wxUSE_IMAGE && wxUSE_STREAMS +#endif // wxUSE_IMAGE