Compile fix.

[wxWidgets.git] / src / common / imagbmp.cpp

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index c9b3a3a55490eb256ddf5f4754a66000944700de..d138bb7345e9a42c0dd3ed3b28b180e33b4cbb1a 100644 (file)
--- 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,
@@ -879,8 +879,6 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
         return FALSE;
 
-    stream.SeekI(-WXSIZEOF(hdr), wxFromCurrent);
-
     // do we have the BMP file signature?
     return hdr[0] == 'B' && hdr[1] == 'M';
 }
@@ -1200,13 +1198,13 @@ int wxICOHandler::GetImageCount(wxInputStream& stream)
 
 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';
 }
 
 
@@ -1219,13 +1217,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
 
 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';
 }
 
 //-----------------------------------------------------------------------------
@@ -1243,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:
@@ -1260,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 ++;
             }
         }
@@ -1293,25 +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);
-    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 )
+        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);
         }
@@ -1339,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:
@@ -1354,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);