// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "imagbmp.h"
#endif
#endif
#ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#endif
//-----------------------------------------------------------------------------
#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
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,
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
{
if ( verbose )
wxLogError(_("BMP: wxImage doesn't have own wxPalette."));
- return FALSE;
+ return false;
}
bpp = 8;
palette_size = 256;
{
if (verbose)
wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));
- return FALSE;
+ return false;
}
}
if ( !IsMask )
{
if (verbose)
wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));
- return FALSE;
+ return false;
}
}
delete palette;
#endif // wxUSE_PALETTE
delete q_image;
- return FALSE;
+ return false;
}
}
delete []rgbquad;
delete palette;
#endif // wxUSE_PALETTE
delete q_image;
- return FALSE;
+ return false;
}
}
delete[] buffer;
#endif // wxUSE_PALETTE
delete q_image;
- return TRUE;
+ return true;
}
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;
wxUint16 aWord;
// allocate space for palette if needed:
- _cmap *cmap = NULL;
+ _cmap *cmap;
if ( bpp < 16 )
{
{
if (verbose)
wxLogError(_("BMP: Couldn't allocate memory."));
- return FALSE;
+ return false;
}
}
else
wxLogError( _("BMP: Couldn't allocate memory.") );
if ( cmap )
delete[] cmap;
- return FALSE;
+ return false;
}
// Reading the palette, if it exists:
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;
}
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;
delete[] cmap;
- image->SetMask(FALSE);
+ image->SetMask(false);
const wxStreamError err = stream.GetLastError();
return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
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);
{
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);
{
if (verbose)
wxLogError( _("DIB Header: Unknown bitdepth in file.") );
- return FALSE;
+ return false;
}
stream.Read(dbuf, 4 * 4);
{
if (verbose)
wxLogError( _("DIB Header: Unknown encoding in file.") );
- return FALSE;
+ return false;
}
stream.Read(dbuf, 4 * 2);
{
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 )
//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)
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';
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
{
if ( verbose )
wxLogError(_("ICO: Error writing the image file!"));
- return FALSE;
+ return false;
}
// for each iamage write a description ICONDIRENTRY:
// 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
{
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,
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;
- 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:
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 )
{
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);
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';
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';
stream.SeekI(0);
stream.Read(&FCC1, 4);
if ( FCC1 != riff32 )
- return FALSE;
+ return false;
// we have a riff file:
while (stream.IsOk())
// try to read next data chunk:
stream.Read(&FCC1, 4);
}
- return FALSE;
+ return false;
}
bool wxANIHandler::DoCanRead(wxInputStream& stream)
{
wxInt32 FCC1, FCC2;
wxUint32 datalen ;
-
+
wxInt32 riff32;
memcpy( &riff32, "RIFF", 4 );
wxInt32 list32;
memcpy( &list32, "LIST", 4 );
wxInt32 ico32;
- memcpy( &ico32, "icon", 4 );
+ 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) ;
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)
memcpy( &ico32, "icon", 4 );
wxInt32 anih32;
memcpy( &anih32, "anih", 4 );
-
+
stream.SeekI(0);
stream.Read(&FCC1, 4);
if ( FCC1 != riff32 )
projects / wxWidgets.git / blobdiff