X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39d16996b7616bf8090b140db74fd0b52d50d169..f6f5941be5f080ca42cb5fed4b672f5db16c0d8e:/src/common/imagbmp.cpp

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 85124d1a75..d138bb7345 100644
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -750,7 +750,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
 
      image->SetMask(FALSE);
 
-    return stream.IsOk();
+    return ( stream.LastError() == wxSTREAM_NO_ERROR || stream.LastError() == wxSTREAM_EOF );
 }
 
 bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
@@ -1198,6 +1198,7 @@ int wxICOHandler::GetImageCount(wxInputStream& stream)
 
 bool wxICOHandler::DoCanRead(wxInputStream& stream)
 {
+    stream.SeekI(0);   
     unsigned char hdr[4];
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
         return FALSE;
@@ -1216,6 +1217,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
 
 bool wxCURHandler::DoCanRead(wxInputStream& stream)
 {
+    stream.SeekI(0);
     unsigned char hdr[4];
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
         return FALSE;
@@ -1239,15 +1241,15 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
     static const char *listtxt = "LIST";
     static const char *icotxt  = "icon";
 
-    wxInt32 *riff32 = (wxInt32 *) rifftxt;
-    wxInt32 *list32 = (wxInt32 *) listtxt;
-    wxInt32 *ico32  = (wxInt32 *) icotxt;
+    wxInt32 riff32 = (wxInt32) rifftxt;
+    wxInt32 list32 = (wxInt32) listtxt;
+    wxInt32 ico32  = (wxInt32) icotxt;
 
     int iIcon = 0;
 
     stream.SeekI(0);
     stream.Read(&FCC1, 4);
-    if ( FCC1 != *riff32 )
+    if ( FCC1 != riff32 )
         return FALSE;
 
     // we have a riff file:
@@ -1256,21 +1258,23 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
         // 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);
         }
         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 ++;
             }
         }
@@ -1289,26 +1293,29 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";
 
-    wxInt32 *riff32 = (wxInt32 *) rifftxt;
-    wxInt32 *list32 = (wxInt32 *) listtxt;
-    wxInt32 *anih32 = (wxInt32 *) anihtxt;
+    wxInt32 riff32 = (wxInt32) rifftxt;
+    wxInt32 list32 = (wxInt32) listtxt;
+    wxInt32 anih32 = (wxInt32) anihtxt;
 
+    stream.SeekI(0);
     if ( !stream.Read(&FCC1, 4) )
         return FALSE;
 
-    if ( FCC1 != *riff32 )
+    if ( FCC1 != riff32 )
         return FALSE;
 
     // we have a riff file:
     while ( stream.IsOk() )
     {
-        if ( FCC1 == *anih32 )
+        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);
         }
@@ -1336,13 +1343,13 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";
 
-    wxInt32 *riff32 = (wxInt32 *) rifftxt;
-    wxInt32 *list32 = (wxInt32 *) listtxt;
-    wxInt32 *anih32 = (wxInt32 *) anihtxt;
+    wxInt32 riff32 = (wxInt32) rifftxt;
+    wxInt32 list32 = (wxInt32) listtxt;
+    wxInt32 anih32 = (wxInt32) anihtxt;
 
     stream.SeekI(0);
     stream.Read(&FCC1, 4);
-    if ( FCC1 != *riff32 )
+    if ( FCC1 != riff32 )
         return wxNOT_FOUND;
 
     // we have a riff file:
@@ -1351,14 +1358,16 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
         // 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);
         }
         else
         {
-            if ( FCC1 == *anih32 )
+            if ( FCC1 == anih32 )
             {
                 wxUint32 *pData = new wxUint32[datalen/4];
                 stream.Read(pData, datalen);