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

fix const char * cast to int in imagbmp.cpp bug

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2002-11-18 16:04:19 +00:00
parent 185bb8af9a
commit 3edae636f9
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/common/imagbmp.cpp
View File

@@ -1318,14 +1318,13 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
{
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);
@@ -1370,13 +1369,15 @@ 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) )
@@ -1420,13 +1421,15 @@ 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);