X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9042a0173883c96e7191ee18e81bc51f533e298f..4c420a80e0fb11511b235411875ba5d3e0eb8492:/src/common/imagbmp.cpp diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index 75e579a17b..e3e9cb67ad 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 @@ -68,7 +76,7 @@ bool wxBMPHandler::SaveFile(wxImage *image, wxOutputStream& stream, bool verbose) { - return SaveDib(image, stream, verbose, TRUE/*IsBmp*/, FALSE/*IsMask*/); + return SaveDib(image, stream, verbose, true/*IsBmp*/, false/*IsMask*/); } bool wxBMPHandler::SaveDib(wxImage *image, @@ -78,13 +86,13 @@ bool wxBMPHandler::SaveDib(wxImage *image, bool IsMask) { - wxCHECK_MSG( image, FALSE, _T("invalid pointer in wxBMPHandler::SaveFile") ); + wxCHECK_MSG( image, false, _T("invalid pointer in wxBMPHandler::SaveFile") ); if ( !image->Ok() ) { if ( verbose ) wxLogError(_("BMP: Couldn't save invalid image.")); - return FALSE; + return false; } // get the format of the BMP file to save, else use 24bpp @@ -118,7 +126,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, { if ( verbose ) wxLogError(_("BMP: wxImage doesn't have own wxPalette.")); - return FALSE; + return false; } bpp = 8; palette_size = 256; @@ -193,7 +201,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, { if (verbose) wxLogError(_("BMP: Couldn't write the file (Bitmap) header.")); - return FALSE; + return false; } } if ( !IsMask ) @@ -214,7 +222,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, { if (verbose) wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header.")); - return FALSE; + return false; } } @@ -293,7 +301,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, delete palette; #endif // wxUSE_PALETTE delete q_image; - return FALSE; + return false; } } delete []rgbquad; @@ -425,7 +433,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, delete palette; #endif // wxUSE_PALETTE delete q_image; - return FALSE; + return false; } } delete[] buffer; @@ -434,7 +442,7 @@ bool wxBMPHandler::SaveDib(wxImage *image, #endif // wxUSE_PALETTE delete q_image; - return TRUE; + return true; } @@ -457,7 +465,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, wxUint16 aWord; // allocate space for palette if needed: - _cmap *cmap = NULL; + _cmap *cmap; if ( bpp < 16 ) { @@ -466,7 +474,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, { if (verbose) wxLogError(_("BMP: Couldn't allocate memory.")); - return FALSE; + return false; } } else @@ -484,7 +492,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, wxLogError( _("BMP: Couldn't allocate memory.") ); if ( cmap ) delete[] cmap; - return FALSE; + return false; } // Reading the palette, if it exists: @@ -600,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; @@ -631,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; @@ -715,63 +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; - /* use the masks and calculated amonut of shift + } + 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.LastError() != wxStream_NOERROR ) - break; - } - } - if (cmap) - delete[] cmap; - - image->SetMask(FALSE); - - return ( stream.LastError() == wxSTREAM_NO_ERROR || stream.LastError() == wxSTREAM_EOF ); + 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, @@ -811,13 +874,13 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, { if (verbose) wxLogError( _("DIB Header: Image width > 32767 pixels for file.") ); - return FALSE; + return false; } if ( height > 32767 ) { if (verbose) wxLogError( _("DIB Header: Image height > 32767 pixels for file.") ); - return FALSE; + return false; } stream.Read(&aWord, 2); @@ -831,7 +894,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, { if (verbose) wxLogError( _("DIB Header: Unknown bitdepth in file.") ); - return FALSE; + return false; } stream.Read(dbuf, 4 * 4); @@ -841,7 +904,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, { if (verbose) wxLogError( _("DIB Header: Unknown encoding in file.") ); - return FALSE; + return false; } stream.Read(dbuf, 4 * 2); @@ -855,16 +918,16 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, { if (verbose) wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") ); - return FALSE; + return false; } //read DIB; this is the BMP image or the XOR part of an icon image if ( !DoLoadDib(image, width, height, bpp, ncolors, comp, offset, stream, - verbose, IsBmp, TRUE) ) + verbose, IsBmp, true) ) { if (verbose) wxLogError( _("Error in reading image DIB .") ); - return FALSE; + return false; } if ( !IsBmp ) @@ -873,24 +936,24 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, //there is no palette, so we will create one wxImage mask; if ( !DoLoadDib(&mask, width, height, 1, 2, BI_RGB, offset, stream, - verbose, IsBmp, FALSE) ) + verbose, IsBmp, false) ) { if (verbose) wxLogError( _("ICO: Error in reading mask DIB.") ); - return FALSE; + return false; } image->SetMaskFromImage(mask, 255, 255, 255); } - return TRUE; + return true; } bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index)) { // Read a single DIB fom the file: - return LoadDib(image, stream, verbose, TRUE/*isBmp*/); + return LoadDib(image, stream, verbose, true/*isBmp*/); } bool wxBMPHandler::DoCanRead(wxInputStream& stream) @@ -898,12 +961,14 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream) unsigned char hdr[2]; if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) - return FALSE; + return false; // do we have the BMP file signature? return hdr[0] == 'B' && hdr[1] == 'M'; } +#endif // wxUSE_STREAMS + #if wxUSE_ICO_CUR //----------------------------------------------------------------------------- @@ -912,6 +977,8 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream) IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler) +#if wxUSE_STREAMS + struct ICONDIRENTRY { wxUint8 bWidth; // Width of the image @@ -941,19 +1008,18 @@ 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 ) { if ( verbose ) wxLogError(_("ICO: Image too tall for an icon.")); - return FALSE; + return false; } if ( image->GetWidth () > 255 ) { if ( verbose ) wxLogError(_("ICO: Image too wide for an icon.")); - return FALSE; + return false; } int images = 1; // only generate one image @@ -979,7 +1045,7 @@ bool wxICOHandler::SaveFile(wxImage *image, { if ( verbose ) wxLogError(_("ICO: Error writing the image file!")); - return FALSE; + return false; } // for each iamage write a description ICONDIRENTRY: @@ -1028,37 +1094,37 @@ bool wxICOHandler::SaveFile(wxImage *image, // monochome bitmap: mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW); - bool IsBmp = FALSE; - bool IsMask = FALSE; + bool IsBmp = false; + bool IsMask = false; //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 ) wxLogError(_("ICO: Error writing the image file!")); - return FALSE; + return false; } - IsMask = TRUE; + IsMask = true; bResult = SaveDib(&mask, cStream, verbose, IsBmp, IsMask); if ( !bResult ) { if ( verbose ) wxLogError(_("ICO: Error writing the image file!")); - return FALSE; + return false; } wxUint32 Size = cStream.GetSize(); - // wxCountingOutputStream::Ok() always returns TRUE for now and this + // wxCountingOutputStream::Ok() always returns true for now and this // "if" provokes VC++ warnings in optimized build #if 0 if ( !cStream.Ok() ) { if ( verbose ) wxLogError(_("ICO: Error writing the image file!")); - return FALSE; + return false; } #endif // 0 @@ -1102,31 +1168,31 @@ bool wxICOHandler::SaveFile(wxImage *image, { if ( verbose ) wxLogError(_("ICO: Error writing the image file!")); - return FALSE; + return false; } // actually save it: - IsMask = FALSE; + IsMask = false; bResult = SaveDib(image, stream, verbose, IsBmp, IsMask); if ( !bResult ) { if ( verbose ) wxLogError(_("ICO: Error writing the image file!")); - return FALSE; + return false; } - IsMask = TRUE; + IsMask = true; bResult = SaveDib(&mask, stream, verbose, IsBmp, IsMask); if ( !bResult ) { if ( verbose ) wxLogError(_("ICO: Error writing the image file!")); - return FALSE; + return false; } } // end of for loop - return TRUE; + return true; } bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream, @@ -1139,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; @@ -1186,14 +1252,14 @@ 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 { // seek to selected icon: pCurrentEntry = pIconDirEntry + iSel; stream.SeekI(iPos + wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset), wxFromStart); - bResult = LoadDib(image, stream, TRUE, IsBmp); + bResult = LoadDib(image, stream, true, IsBmp); bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI); if ( bResult && bIsCursorType && nType == 2 ) { @@ -1219,15 +1285,16 @@ int wxICOHandler::GetImageCount(wxInputStream& stream) bool wxICOHandler::DoCanRead(wxInputStream& stream) { - stream.SeekI(0); + stream.SeekI(0); unsigned char hdr[4]; if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) - return FALSE; + 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 //----------------------------------------------------------------------------- @@ -1236,42 +1303,47 @@ 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]; if ( !stream.Read(hdr, WXSIZEOF(hdr)) ) - return FALSE; + 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 ) - return FALSE; + return false; // we have a riff file: while (stream.IsOk()) @@ -1303,33 +1375,35 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream, // try to read next data chunk: stream.Read(&FCC1, 4); } - return FALSE; + return false; } 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); if ( !stream.Read(&FCC1, 4) ) - return FALSE; + return false; if ( FCC1 != riff32 ) - return FALSE; + return false; // we have a riff file: while ( stream.IsOk() ) { if ( FCC1 == anih32 ) - return TRUE; + return true; // we always have a data size: stream.Read(&datalen, 4); datalen = wxINT32_SWAP_ON_BE(datalen) ; @@ -1349,24 +1423,26 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream) if ( !stream.Read(&FCC1, 4) ) { // reading failed -- either EOF or IO error, bail out anyhow - return FALSE; + return false; } } - return FALSE; + return false; } 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); @@ -1407,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