Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typecast before endian adjustements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-17 16:36:28 +00:00
parent 26481315da
commit ecae80b250
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/imagbmp.cpp
View File

@@ -865,8 +865,8 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
offset = offset + wxINT32_SWAP_ON_BE(dbuf[2]); offset = offset + wxINT32_SWAP_ON_BE(dbuf[2]);
stream.Read(dbuf, 4 * 2); stream.Read(dbuf, 4 * 2);
int width = (int)wxINT32_SWAP_ON_BE(dbuf[0]); int width = wxINT32_SWAP_ON_BE((int)dbuf[0]);
int height = (int)wxINT32_SWAP_ON_BE(dbuf[1]); int height = wxINT32_SWAP_ON_BE((int)dbuf[1]);
if ( !IsBmp)height = height / 2; // for icons divide by 2 if ( !IsBmp)height = height / 2; // for icons divide by 2
if ( width > 32767 ) if ( width > 32767 )
@@ -888,7 +888,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
int planes = (int)wxUINT16_SWAP_ON_BE( aWord ); int planes = (int)wxUINT16_SWAP_ON_BE( aWord );
*/ */
stream.Read(&aWord, 2); stream.Read(&aWord, 2);
int bpp = (int)wxUINT16_SWAP_ON_BE(aWord); int bpp = wxUINT16_SWAP_ON_BE((int)aWord);
if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 ) if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
{ {
if (verbose) if (verbose)
@@ -897,7 +897,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
} }
stream.Read(dbuf, 4 * 4); stream.Read(dbuf, 4 * 4);
int comp = (int)wxINT32_SWAP_ON_BE(dbuf[0]); int comp = wxINT32_SWAP_ON_BE((int)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 ) comp != BI_BITFIELDS )
{ {
@@ -907,7 +907,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
} }
stream.Read(dbuf, 4 * 2); stream.Read(dbuf, 4 * 2);
int ncolors = (int)wxINT32_SWAP_ON_BE( dbuf[0] ); int ncolors = wxINT32_SWAP_ON_BE( (int)dbuf[0] );
if (ncolors == 0) if (ncolors == 0)
ncolors = 1 << bpp; ncolors = 1 << bpp;
/* some more sanity checks */ /* some more sanity checks */
@@ -1035,8 +1035,8 @@ bool wxICOHandler::SaveFile(wxImage *image,
ICONDIR IconDir; ICONDIR IconDir;
IconDir.idReserved = 0; IconDir.idReserved = 0;
IconDir.idType = (wxUint16)wxUINT16_SWAP_ON_BE(type); IconDir.idType = wxUINT16_SWAP_ON_BE((wxUint16)type);
IconDir.idCount = (wxUint16)wxUINT16_SWAP_ON_BE(images); IconDir.idCount = wxUINT16_SWAP_ON_BE((wxUint16)images);
stream.Write(&IconDir.idReserved, sizeof(IconDir.idReserved)); stream.Write(&IconDir.idReserved, sizeof(IconDir.idReserved));
stream.Write(&IconDir.idType, sizeof(IconDir.idType)); stream.Write(&IconDir.idType, sizeof(IconDir.idType));
stream.Write(&IconDir.idCount, sizeof(IconDir.idCount)); stream.Write(&IconDir.idCount, sizeof(IconDir.idCount));