Hopefully corrected conversion buffer size.

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index f50bdbc30e2fd5c4cdebe9c9fc422acd1bd0748f..71b32dcaefbe7649dd6bac4d5108b77b6b8d9555 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -89,8 +89,8 @@ bool wxBMPHandler::SaveDib(wxImage *image,
 
     // get the format of the BMP file to save, else use 24bpp
     unsigned format = wxBMP_24BPP;
 
     // get the format of the BMP file to save, else use 24bpp
     unsigned format = wxBMP_24BPP;

-    if ( image->HasOption(wxBMP_FORMAT) )
-        format = image->GetOptionInt(wxBMP_FORMAT);
+    if ( image->HasOption(wxIMAGE_OPTION_BMP_FORMAT) )
+        format = image->GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT);

 
     wxUint16 bpp;     // # of bits per pixel
     int palette_size; // # of color map entries, ie. 2^bpp colors
 
     wxUint16 bpp;     // # of bits per pixel
     int palette_size; // # of color map entries, ie. 2^bpp colors


@@ -750,7 +750,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
 
      image->SetMask(FALSE);
 
 
      image->SetMask(FALSE);
 

-    return stream.IsOk();
+    return ( stream.LastError() == wxSTREAM_NO_ERROR || stream.LastError() == wxSTREAM_EOF );

 }
 
 bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
 }
 
 bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,


@@ -876,9 +876,11 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
 {
     unsigned char hdr[2];
 
 {
     unsigned char hdr[2];
 

-    stream.Read(hdr, 2);
-    stream.SeekI(-2, wxFromCurrent);
-    return (hdr[0] == 'B' && hdr[1] == 'M');
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return FALSE;
+
+    // do we have the BMP file signature?
+    return hdr[0] == 'B' && hdr[1] == 'M';

 }
 
 
 }
 
 


@@ -1001,10 +1003,10 @@ bool wxICOHandler::SaveFile(wxImage *image,
         }
         // Set the formats for image and mask
         // (Windows never saves with more than 8 colors):
         }
         // Set the formats for image and mask
         // (Windows never saves with more than 8 colors):

-        image->SetOption(wxBMP_FORMAT, wxBMP_8BPP);
+        image->SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_8BPP);

 
         // monochome bitmap:
 
         // monochome bitmap:

-        mask.SetOption(wxBMP_FORMAT, wxBMP_1BPP_BW);
+        mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW);

         bool IsBmp = FALSE;
         bool IsMask = FALSE;
 
         bool IsBmp = FALSE;
         bool IsMask = FALSE;
 


@@ -1049,11 +1051,11 @@ bool wxICOHandler::SaveFile(wxImage *image,
         icondirentry.wBitCount = wxUINT16_SWAP_ON_BE(wxBMP_8BPP);
         if ( type == 2 /*CUR*/)
         {
         icondirentry.wBitCount = wxUINT16_SWAP_ON_BE(wxBMP_8BPP);
         if ( type == 2 /*CUR*/)
         {

-            int hx = image->HasOption(wxCUR_HOTSPOT_X) ?
-                         image->GetOptionInt(wxCUR_HOTSPOT_X) :
+            int hx = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ?
+                         image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) :

                          image->GetWidth() / 2;
                          image->GetWidth() / 2;

-            int hy = image->HasOption(wxCUR_HOTSPOT_Y) ?
-                         image->GetOptionInt(wxCUR_HOTSPOT_Y) :
+            int hy = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ?
+                         image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) :

                          image->GetHeight() / 2;
 
             // actually write the values of the hot spot here:
                          image->GetHeight() / 2;
 
             // actually write the values of the hot spot here:


@@ -1175,8 +1177,8 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
         if ( bResult && bIsCursorType && nType == 2 )
         {
             // it is a cursor, so let's set the hotspot:
         if ( bResult && bIsCursorType && nType == 2 )
         {
             // it is a cursor, so let's set the hotspot:

-            image->SetOption(wxCUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
-            image->SetOption(wxCUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
+            image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
+            image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));

         }
     }
     delete[] pIconDirEntry;
         }
     }
     delete[] pIconDirEntry;


@@ -1196,13 +1198,13 @@ int wxICOHandler::GetImageCount(wxInputStream& stream)
 
 bool wxICOHandler::DoCanRead(wxInputStream& stream)
 {
 
 bool wxICOHandler::DoCanRead(wxInputStream& stream)
 {

+    stream.SeekI(0);   

     unsigned char hdr[4];
     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';

 }
 
 
 }
 
 


@@ -1215,13 +1217,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
 
 bool wxCURHandler::DoCanRead(wxInputStream& stream)
 {
 
 bool wxCURHandler::DoCanRead(wxInputStream& stream)
 {

+    stream.SeekI(0);

     unsigned char hdr[4];
     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';

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -1255,11 +1257,13 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
     {
         // we always have a data size
         stream.Read(&datalen, 4);
     {
         // 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) )
         {
         //now either data or a FCC
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
         {

-           stream.Read(&FCC2, 4);
+            stream.Read(&FCC2, 4);

         }
         else
         {
         }
         else
         {


@@ -1294,22 +1298,26 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
     wxInt32 *anih32 = (wxInt32 *) anihtxt;
 
     stream.SeekI(0);
     wxInt32 *anih32 = (wxInt32 *) anihtxt;
 
     stream.SeekI(0);

-    stream.Read(&FCC1, 4);
+    if ( !stream.Read(&FCC1, 4) )
+        return FALSE;
+

     if ( FCC1 != *riff32 )
         return FALSE;
 
     // we have a riff file:
     while ( stream.IsOk() )
     {
     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);
             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) )
         {
         // now either data or a FCC:
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
         {

-                   stream.Read(&FCC2, 4);
+            stream.Read(&FCC2, 4);

         }
         else
         {
         }
         else
         {


@@ -1317,7 +1325,11 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
         }
 
         // try to read next data chunk:
         }
 
         // try to read next data chunk:

-        stream.Read(&FCC1, 4);
+        if ( !stream.Read(&FCC1, 4) )
+        {
+            // reading failed -- either EOF or IO error, bail out anyhow
+            return FALSE;
+        }

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -1345,11 +1357,13 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
     {
         // we always have a data size:
         stream.Read(&datalen, 4);
     {
         // 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) )
         // now either data or a FCC:
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )

-       {
-           stream.Read(&FCC2, 4);
+        {
+            stream.Read(&FCC2, 4);

         }
         else
         {
         }
         else
         {


@@ -1357,7 +1371,7 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
             {
                 wxUint32 *pData = new wxUint32[datalen/4];
                 stream.Read(pData, datalen);
             {
                 wxUint32 *pData = new wxUint32[datalen/4];
                 stream.Read(pData, datalen);

-                int nIcons = *(pData + 1);
+                int nIcons = wxINT32_SWAP_ON_BE(*(pData + 1));

                 delete[] pData;
                 return nIcons;
             }
                 delete[] pData;
                 return nIcons;
             }