// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "imagbmp.h"
#endif
#include "wx/defs.h"
-#if wxUSE_IMAGE && wxUSE_STREAMS
+#if wxUSE_IMAGE
#include "wx/imagbmp.h"
#include "wx/bitmap.h"
#endif
#ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#endif
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
+#if wxUSE_STREAMS
+
#ifndef BI_RGB
#define BI_RGB 0
#define BI_RLE8 1
bool wxBMPHandler::SaveFile(wxImage *image,
wxOutputStream& stream,
bool verbose)
-{
+{
return SaveDib(image, stream, verbose, TRUE/*IsBmp*/, FALSE/*IsMask*/);
}
if ( !image->Ok() )
{
- if ( verbose )
+ if ( verbose )
wxLogError(_("BMP: Couldn't save invalid image."));
return FALSE;
}
// get the format of the BMP file to save, else use 24bpp
unsigned format = wxBMP_24BPP;
- if ( image->HasOption(wxBMP_FORMAT) )
- format = image->GetOptionInt(wxBMP_FORMAT);
+ if ( image->HasOption(wxIMAGE_OPTION_BMP_FORMAT) )
+ format = image->GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT);
- unsigned bpp; // # of bits per pixel
+ wxUint16 bpp; // # of bits per pixel
int palette_size; // # of color map entries, ie. 2^bpp colors
// set the bpp and appropriate palette_size, and do additional checks
hdr.h_res = hdr.v_res = wxUINT32_SWAP_ON_BE(72); // 72dpi is standard
hdr.num_clrs = wxUINT32_SWAP_ON_BE(palette_size); // # colors in colormap
hdr.num_signif_clrs = 0; // all colors are significant
-
+
if ( IsBmp )
{
if (// VS: looks ugly but compilers tend to do ugly things with structs,
!stream.Write(&hdr.magic, 2) ||
!stream.Write(&hdr.filesize, 4) ||
!stream.Write(&hdr.reserved, 4) ||
- !stream.Write(&hdr.data_offset, 4)
+ !stream.Write(&hdr.data_offset, 4)
)
{
if (verbose)
unsigned char r, g, b;
} _cmap;
-bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
+bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
int bpp, int ncolors, int comp,
off_t bmpOffset, wxInputStream& stream,
bool verbose, bool IsBmp, bool hasPalette)
{
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;
// destroy existing here instead of:
image->Destroy();
image->Create(width, height);
-
+
unsigned char *ptr = image->GetData();
if ( !ptr )
{
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;
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 )
{
rshift = 10;
gshift = 5;
bshift = 0;
+ rbits = 5;
+ gbits = 5;
+ bbits = 5;
}
else if ( bpp == 32 )
{
rshift = 16;
gshift = 8;
bshift = 0;
+ rbits = 8;
+ gbits = 8;
+ bbits = 8;
}
}
for ( line = (height - 1); line >= 0; line-- )
{
int linepos = 0;
- for ( column = 0; column < width; )
+ for ( column = 0; column < width ; )
{
if ( bpp < 16 )
{
{
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
{
// 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,
+bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
bool verbose, bool IsBmp)
{
wxUint16 aWord;
int width = (int)wxINT32_SWAP_ON_BE(dbuf[0]);
int height = (int)wxINT32_SWAP_ON_BE(dbuf[1]);
if ( !IsBmp)height = height / 2; // for icons divide by 2
-
+
if ( width > 32767 )
{
if (verbose)
stream.Read(dbuf, 4 * 4);
int comp = (int)wxINT32_SWAP_ON_BE(dbuf[0]);
- if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&
+ if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&
comp != BI_BITFIELDS )
{
if (verbose)
return TRUE;
}
-bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream,
+bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream,
bool verbose, int WXUNUSED(index))
{
// Read a single DIB fom the file:
{
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
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler)
+#if wxUSE_STREAMS
+
struct ICONDIRENTRY
{
wxUint8 bWidth; // Width of the image
int images = 1; // only generate one image
- // VS: This is a hack of sort - since ICO and CUR files are almost
+ // VS: This is a hack of sort - since ICO and CUR files are almost
// identical, we have all the meat in wxICOHandler and check for
// the actual (handler) type when the code has to distinguish between
// the two formats
wxImage mask;
if ( image->HasMask() )
- {
+ {
// make another image with black/white:
mask = image->ConvertToMono (image->GetMaskRed(), image->GetMaskGreen(), image->GetMaskBlue() );
{
for (j = 0; j < mask.GetHeight(); j++)
{
- if ((r == mask.GetRed(i, j)) &&
- (g == mask.GetGreen(i, j))&&
+ if ((r == mask.GetRed(i, j)) &&
+ (g == mask.GetGreen(i, j))&&
(b == mask.GetBlue(i, j)) )
image->SetRGB(i, j, 0, 0, 0 );
}
}
// Set the formats for image and mask
// (Windows never saves with more than 8 colors):
- image->SetOption(wxBMP_FORMAT, wxBMP_8BPP);
+ image->SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_8BPP);
// monochome bitmap:
- mask.SetOption(wxBMP_FORMAT, wxBMP_1BPP_BW);
+ mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW);
bool IsBmp = FALSE;
bool IsMask = FALSE;
icondirentry.wBitCount = wxUINT16_SWAP_ON_BE(wxBMP_8BPP);
if ( type == 2 /*CUR*/)
{
- int hx = image->HasOption(wxCUR_HOTSPOT_X) ?
- image->GetOptionInt(wxCUR_HOTSPOT_X) :
+ int hx = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ?
+ image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) :
image->GetWidth() / 2;
- int hy = image->HasOption(wxCUR_HOTSPOT_Y) ?
- image->GetOptionInt(wxCUR_HOTSPOT_Y) :
+ int hy = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ?
+ image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) :
image->GetHeight() / 2;
// actually write the values of the hot spot here:
return TRUE;
}
-bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
+bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
bool verbose, int index)
{
stream.SeekI(0);
return DoLoadFile(image, stream, verbose, index);
}
-bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
- bool verbose, int index)
+bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
+ bool WXUNUSED(verbose), int index)
{
bool bResult = FALSE;
bool IsBmp = FALSE;
wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
// nType is 1 for Icons, 2 for Cursors:
wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
-
+
// loop round the icons and choose the best one:
ICONDIRENTRY *pIconDirEntry = new ICONDIRENTRY[nIcons];
ICONDIRENTRY *pCurrentEntry = pIconDirEntry;
if ( pCurrentEntry->bColorCount == 0 )
pCurrentEntry->bColorCount = 255;
if ( pCurrentEntry->bColorCount >= colmax )
- {
+ {
iSel = i;
wMax = pCurrentEntry->bWidth;
colmax = pCurrentEntry->bColorCount;
}
pCurrentEntry++;
}
-
+
if ( index != -1 )
{
// VS: Note that we *have* to run the loop above even if index != -1, because
// it reads ICONDIRENTRies.
iSel = index;
}
-
+
if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons )
{
wxLogError(_("ICO: Invalid icon index."));
if ( bResult && bIsCursorType && nType == 2 )
{
// it is a cursor, so let's set the hotspot:
- image->SetOption(wxCUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
- image->SetOption(wxCUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
+ image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
+ image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
}
}
delete[] pIconDirEntry;
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
//-----------------------------------------------------------------------------
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)
-bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
+#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 FCC1, FCC2;
+ wxUint32 datalen;
+
+ 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:
while (stream.IsOk())
- {
+ {
// 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
+ 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 ++;
}
}
-
+
// try to read next data chunk:
stream.Read(&FCC1, 4);
}
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 FCC1, FCC2;
+ wxUint32 datalen ;
+
+ 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 )
- return TRUE;
+ if ( FCC1 == anih32 )
+ return TRUE;
// 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
+ else
{
stream.SeekI(stream.TellI() + datalen);
}
-
+
// 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;
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 FCC1, FCC2;
+ wxUint32 datalen ;
+
+ 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:
{
// 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);
- int nIcons = *(pData + 1);
+ int nIcons = wxINT32_SWAP_ON_BE(*(pData + 1));
delete[] pData;
return nIcons;
}
- else
+ else
stream.SeekI(stream.TellI() + datalen);
}
-
+
// try to read next data chunk:
stream.Read(&FCC1, 4);
}
return wxNOT_FOUND;
}
+#endif // wxUSE_STREAMS
+
#endif // wxUSE_ICO_CUR
-#endif // wxUSE_IMAGE && wxUSE_STREAMS
+#endif // wxUSE_IMAGE
projects / wxWidgets.git / blobdiff