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

Use wxUint16 instead of WORD and wxUint8 instead of BYTE.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-11-15 20:51:05 +00:00
parent 4b8f2c2b5f
commit f12a90c7c2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/imagbmp.cpp
View File

@@ -1035,8 +1035,8 @@ bool wxICOHandler::SaveFile(wxImage *image,
ICONDIR IconDir; ICONDIR IconDir;
IconDir.idReserved = 0; IconDir.idReserved = 0;
IconDir.idType = (WORD)wxUINT16_SWAP_ON_BE(type); IconDir.idType = (wxUint16)wxUINT16_SWAP_ON_BE(type);
IconDir.idCount = (WORD)wxUINT16_SWAP_ON_BE(images); IconDir.idCount = (wxUint16)wxUINT16_SWAP_ON_BE(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));
@@ -1129,8 +1129,8 @@ bool wxICOHandler::SaveFile(wxImage *image,
offset = offset + sizeof(ICONDIRENTRY); offset = offset + sizeof(ICONDIRENTRY);
icondirentry.bWidth = (BYTE)image->GetWidth(); icondirentry.bWidth = (wxUint8)image->GetWidth();
icondirentry.bHeight = (BYTE)(2 * image->GetHeight()); icondirentry.bHeight = (wxUint8)(2 * image->GetHeight());
icondirentry.bColorCount = 0; icondirentry.bColorCount = 0;
icondirentry.bReserved = 0; icondirentry.bReserved = 0;
icondirentry.wPlanes = wxUINT16_SWAP_ON_BE(1); icondirentry.wPlanes = wxUINT16_SWAP_ON_BE(1);