Compilation fixes for wx{X11,GTK1,Motif} after making ref data non copyable.

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 66718fc518fb63bd974134aeeb4b9c4e4669527f..41edf784b42bd491fdbb768aed602333b5d3910d 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -33,6 +33,7 @@
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/quantize.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/quantize.h"

+#include "wx/scopeguard.h"

 #include "wx/anidecod.h"
 
 // For memcpy
 #include "wx/anidecod.h"
 
 // For memcpy


@@ -78,12 +79,14 @@ bool wxBMPHandler::SaveDib(wxImage *image,
                            bool IsMask)
 
 {
                            bool IsMask)
 
 {

-    wxCHECK_MSG( image, false, _T("invalid pointer in wxBMPHandler::SaveFile") );
+    wxCHECK_MSG( image, false, wxT("invalid pointer in wxBMPHandler::SaveFile") );

 
     if ( !image->Ok() )
     {
         if ( verbose )
 
     if ( !image->Ok() )
     {
         if ( verbose )

+        {

             wxLogError(_("BMP: Couldn't save invalid image."));
             wxLogError(_("BMP: Couldn't save invalid image."));

+        }

         return false;
     }
 
         return false;
     }
 


@@ -117,7 +120,9 @@ bool wxBMPHandler::SaveDib(wxImage *image,
             )
         {
             if ( verbose )
             )
         {
             if ( verbose )

+            {

                 wxLogError(_("BMP: wxImage doesn't have own wxPalette."));
                 wxLogError(_("BMP: wxImage doesn't have own wxPalette."));

+            }

             return false;
         }
         bpp = 8;
             return false;
         }
         bpp = 8;


@@ -179,12 +184,11 @@ bool wxBMPHandler::SaveDib(wxImage *image,
 
     // get the resolution from the image options  or fall back to 72dpi standard
     // for the BMP format if not specified
 
     // get the resolution from the image options  or fall back to 72dpi standard
     // for the BMP format if not specified

-    wxUint32 hres = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX),
-             vres = image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY);
-    switch ( image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION) )
+    int hres, vres;
+    switch ( GetResolutionFromOptions(*image, &hres, &vres) )

     {
         default:
     {
         default:

-            wxFAIL_MSG( _T("unexpected image resolution units") );
+            wxFAIL_MSG( wxT("unexpected image resolution units") );

             // fall through
 
         case wxIMAGE_RESOLUTION_NONE:
             // fall through
 
         case wxIMAGE_RESOLUTION_NONE:


@@ -194,8 +198,8 @@ bool wxBMPHandler::SaveDib(wxImage *image,
 
         case wxIMAGE_RESOLUTION_INCHES:
             // convert resolution in inches to resolution in centimeters
 
         case wxIMAGE_RESOLUTION_INCHES:
             // convert resolution in inches to resolution in centimeters

-            hres = (wxUint32)(100*mm2inches*hres);
-            vres = (wxUint32)(100*mm2inches*vres);
+            hres = (int)(10*mm2inches*hres);
+            vres = (int)(10*mm2inches*vres);

             // fall through to convert it to resolution in meters
 
         case wxIMAGE_RESOLUTION_CM:
             // fall through to convert it to resolution in meters
 
         case wxIMAGE_RESOLUTION_CM:


@@ -222,7 +226,9 @@ bool wxBMPHandler::SaveDib(wxImage *image,
            )
         {
             if (verbose)
            )
         {
             if (verbose)

+            {

                 wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));
                 wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));

+                }

             return false;
         }
     }
             return false;
         }
     }


@@ -243,7 +249,9 @@ bool wxBMPHandler::SaveDib(wxImage *image,
            )
         {
             if (verbose)
            )
         {
             if (verbose)

+            {

                 wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));
                 wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));

+            }

             return false;
         }
     }
             return false;
         }
     }


@@ -317,7 +325,9 @@ bool wxBMPHandler::SaveDib(wxImage *image,
             if ( !stream.Write(rgbquad, palette_size*4) )
             {
                 if (verbose)
             if ( !stream.Write(rgbquad, palette_size*4) )
             {
                 if (verbose)

+                {

                     wxLogError(_("BMP: Couldn't write RGB color map."));
                     wxLogError(_("BMP: Couldn't write RGB color map."));

+                }

                 delete[] rgbquad;
 #if wxUSE_PALETTE
                 delete palette;
                 delete[] rgbquad;
 #if wxUSE_PALETTE
                 delete palette;


@@ -450,7 +460,9 @@ bool wxBMPHandler::SaveDib(wxImage *image,
         if ( !stream.Write(buffer, row_width) )
         {
             if (verbose)
         if ( !stream.Write(buffer, row_width) )
         {
             if (verbose)

+            {

                 wxLogError(_("BMP: Couldn't write data."));
                 wxLogError(_("BMP: Couldn't write data."));

+            }

             delete[] buffer;
 #if wxUSE_PALETTE
             delete palette;
             delete[] buffer;
 #if wxUSE_PALETTE
             delete palette;


@@ -469,18 +481,20 @@ bool wxBMPHandler::SaveDib(wxImage *image,
 }
 
 
 }
 
 

-typedef struct
+struct BMPPalette

 {
 {

+    static void Free(BMPPalette* pal) { delete [] pal; }
+

     unsigned char r, g, b;
     unsigned char r, g, b;

-}  _cmap;
+};

 
 bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                              int bpp, int ncolors, int comp,
                              wxFileOffset bmpOffset, wxInputStream& stream,
                              bool verbose, bool IsBmp, bool hasPalette)
 {
 
 bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                              int bpp, int ncolors, int comp,
                              wxFileOffset bmpOffset, wxInputStream& stream,
                              bool verbose, bool IsBmp, bool hasPalette)
 {

-    wxInt32         aDword, rmask = 0, gmask = 0, bmask = 0;
-    int             rshift = 0, gshift = 0, bshift = 0;
+    wxInt32         aDword, rmask = 0, gmask = 0, bmask = 0, amask = 0;
+    int             rshift = 0, gshift = 0, bshift = 0, ashift = 0;

     int             rbits = 0, gbits = 0, bbits = 0;
     wxInt32         dbuf[4];
     wxInt8          bbuf[4];
     int             rbits = 0, gbits = 0, bbits = 0;
     wxInt32         dbuf[4];
     wxInt8          bbuf[4];


@@ -488,20 +502,26 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
     wxUint16        aWord;
 
     // allocate space for palette if needed:
     wxUint16        aWord;
 
     // allocate space for palette if needed:

-    _cmap *cmap;
+    BMPPalette *cmap;

 
     if ( bpp < 16 )
     {
 
     if ( bpp < 16 )
     {

-        cmap = new _cmap[ncolors];
+        cmap = new BMPPalette[ncolors];

         if ( !cmap )
         {
             if (verbose)
         if ( !cmap )
         {
             if (verbose)

+            {

                 wxLogError(_("BMP: Couldn't allocate memory."));
                 wxLogError(_("BMP: Couldn't allocate memory."));

+            }

             return false;
         }
     }
             return false;
         }
     }

-    else
+    else // no palette
+    {

         cmap = NULL;
         cmap = NULL;

+    }
+
+    wxON_BLOCK_EXIT1(&BMPPalette::Free, cmap);

 
     // destroy existing here instead of:
     image->Destroy();
 
     // destroy existing here instead of:
     image->Destroy();


@@ -512,12 +532,32 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
     if ( !ptr )
     {
         if ( verbose )
     if ( !ptr )
     {
         if ( verbose )

+        {

             wxLogError( _("BMP: Couldn't allocate memory.") );
             wxLogError( _("BMP: Couldn't allocate memory.") );

-        if ( cmap )
-            delete[] cmap;
+        }

         return false;
     }
 
         return false;
     }
 

+    unsigned char *alpha;
+    if ( bpp == 32 )
+    {
+        // tell the image to allocate an alpha buffer
+        image->SetAlpha();
+        alpha = image->GetAlpha();
+        if ( !alpha )
+        {
+            if ( verbose )
+            {
+                wxLogError(_("BMP: Couldn't allocate memory."));
+            }
+            return false;
+        }
+    }
+    else // no alpha
+    {
+        alpha = NULL;
+    }
+

     // Reading the palette, if it exists:
     if ( bpp < 16 && ncolors != 0 )
     {
     // Reading the palette, if it exists:
     if ( bpp < 16 && ncolors != 0 )
     {


@@ -559,7 +599,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
     {
         if ( comp == BI_BITFIELDS )
         {
     {
         if ( comp == BI_BITFIELDS )
         {

-            int bit = 0;
+            int bit;

             stream.Read(dbuf, 4 * 3);
             rmask = wxINT32_SWAP_ON_BE(dbuf[0]);
             gmask = wxINT32_SWAP_ON_BE(dbuf[1]);
             stream.Read(dbuf, 4 * 3);
             rmask = wxINT32_SWAP_ON_BE(dbuf[0]);
             gmask = wxINT32_SWAP_ON_BE(dbuf[1]);


@@ -602,6 +642,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
             rmask = 0x00FF0000;
             gmask = 0x0000FF00;
             bmask = 0x000000FF;
             rmask = 0x00FF0000;
             gmask = 0x0000FF00;
             bmask = 0x000000FF;

+            amask = 0xFF000000;
+
+            ashift = 24;

             rshift = 16;
             gshift = 8;
             bshift = 0;
             rshift = 16;
             gshift = 8;
             bshift = 0;


@@ -615,7 +658,15 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
      * Reading the image data
      */
     if ( IsBmp )
      * Reading the image data
      */
     if ( IsBmp )

-        stream.SeekI(bmpOffset); // else icon, just carry on
+    {
+        // NOTE: seeking a positive amount in wxFromCurrent mode allows us to
+        //       load even non-seekable streams (see wxInputStream::SeekI docs)!
+        const wxFileOffset pos = stream.TellI();
+        if (pos != wxInvalidOffset && bmpOffset > pos)
+            if (stream.SeekI(bmpOffset - pos, wxFromCurrent) == wxInvalidOffset)
+                return false;
+        //else: icon, just carry on
+    }

 
     unsigned char *data = ptr;
 
 
     unsigned char *data = ptr;
 


@@ -633,6 +684,14 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
 
     int linesize = ((width * bpp + 31) / 32) * 4;
 
 
     int linesize = ((width * bpp + 31) / 32) * 4;
 

+    // flag indicating if we have any not fully transparent alpha values: this
+    // is used to account for the bitmaps which use 32bpp format (normally
+    // meaning that they have alpha channel) but have only zeroes in it so that
+    // without this hack they appear fully transparent -- and as this is
+    // unlikely intentional, we consider that they don't have alpha at all in
+    // this case (see #10915)
+    bool hasValidAlpha = false;
+

     /* BMPs are stored upside down */
     for ( int line = (height - 1); line >= 0; line-- )
     {
     /* BMPs are stored upside down */
     for ( int line = (height - 1); line >= 0; line-- )
     {


@@ -727,7 +786,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                     {
                         for (int nibble = 0; nibble < 2 && column < width; nibble++)
                         {
                     {
                         for (int nibble = 0; nibble < 2 && column < width; nibble++)
                         {

-                            int index = ((aByte & (0xF0 >> nibble * 4)) >> (!nibble * 4));
+                            int index = ((aByte & (0xF0 >> (nibble * 4))) >> (!nibble * 4));

                             if ( index >= 16 )
                                 index = 15;
                             ptr[poffset] = cmap[index].r;
                             if ( index >= 16 )
                                 index = 15;
                             ptr[poffset] = cmap[index].r;


@@ -816,15 +875,15 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                 stream.Read(&aWord, 2);
                 aWord = wxUINT16_SWAP_ON_BE(aWord);
                 linepos += 2;
                 stream.Read(&aWord, 2);
                 aWord = wxUINT16_SWAP_ON_BE(aWord);
                 linepos += 2;

-                /* use the masks and calculated amonut of shift
+                /* Use the masks and calculated amount of shift

                    to retrieve the color data out of the word.  Then
                    shift it left by (8 - number of bits) such that
                    the image has the proper dynamic range */
                    to retrieve the color data out of the word.  Then
                    shift it left by (8 - number of bits) such that
                    the image has the proper dynamic range */

-                temp = (unsigned char)((aWord & rmask) >> rshift << (8-rbits));
+                temp = (unsigned char)(((aWord & rmask) >> rshift) << (8-rbits));

                 ptr[poffset] = temp;
                 ptr[poffset] = temp;

-                temp = (unsigned char)((aWord & gmask) >> gshift << (8-gbits));
+                temp = (unsigned char)(((aWord & gmask) >> gshift) << (8-gbits));

                 ptr[poffset + 1] = temp;
                 ptr[poffset + 1] = temp;

-                temp = (unsigned char)((aWord & bmask) >> bshift << (8-bbits));
+                temp = (unsigned char)(((aWord & bmask) >> bshift) << (8-bbits));

                 ptr[poffset + 2] = temp;
                 column++;
             }
                 ptr[poffset + 2] = temp;
                 column++;
             }


@@ -840,6 +899,14 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                 ptr[poffset + 1] = temp;
                 temp = (unsigned char)((aDword & bmask) >> bshift);
                 ptr[poffset + 2] = temp;
                 ptr[poffset + 1] = temp;
                 temp = (unsigned char)((aDword & bmask) >> bshift);
                 ptr[poffset + 2] = temp;

+                if ( alpha )
+                {
+                    temp = (unsigned char)((aDword & amask) >> ashift);
+                    alpha[line * width + column] = temp;
+
+                    if ( temp != wxALPHA_TRANSPARENT )
+                        hasValidAlpha = true;
+                }

                 column++;
             }
         }
                 column++;
             }
         }


@@ -852,10 +919,15 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
         }
     }
 
         }
     }
 

-    delete[] cmap;
-

     image->SetMask(false);
 
     image->SetMask(false);
 

+    // check if we had any valid alpha values in this bitmap
+    if ( alpha && !hasValidAlpha )
+    {
+        // we didn't, so finally discard the alpha channel completely
+        image->ClearAlpha();
+    }
+

     const wxStreamError err = stream.GetLastError();
     return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
 }
     const wxStreamError err = stream.GetLastError();
     return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
 }


@@ -867,15 +939,9 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     wxInt32         dbuf[4];
     wxInt8          bbuf[4];
 
     wxInt32         dbuf[4];
     wxInt8          bbuf[4];
 

-    wxFileOffset offset = 0; // keep gcc quiet

     if ( IsBmp )
     {
         // read the header off the .BMP format file
     if ( IsBmp )
     {
         // read the header off the .BMP format file

-
-        offset = stream.TellI();
-        if (offset == wxInvalidOffset)
-            offset = 0;
-

         stream.Read(bbuf, 2);
         stream.Read(dbuf, 16);
     }
         stream.Read(bbuf, 2);
         stream.Read(dbuf, 16);
     }


@@ -886,7 +952,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     #if 0 // unused
         wxInt32 size = wxINT32_SWAP_ON_BE(dbuf[0]);
     #endif
     #if 0 // unused
         wxInt32 size = wxINT32_SWAP_ON_BE(dbuf[0]);
     #endif

-    offset = offset + wxINT32_SWAP_ON_BE(dbuf[2]);
+    wxFileOffset offset = wxINT32_SWAP_ON_BE(dbuf[2]);

 
     stream.Read(dbuf, 4 * 2);
     int width = wxINT32_SWAP_ON_BE((int)dbuf[0]);
 
     stream.Read(dbuf, 4 * 2);
     int width = wxINT32_SWAP_ON_BE((int)dbuf[0]);


@@ -896,13 +962,17 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     if ( width > 32767 )
     {
         if (verbose)
     if ( width > 32767 )
     {
         if (verbose)

+        {

             wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );
             wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );

+        }

         return false;
     }
     if ( height > 32767 )
     {
         if (verbose)
         return false;
     }
     if ( height > 32767 )
     {
         if (verbose)

+        {

             wxLogError( _("DIB Header: Image height > 32767 pixels for file.") );
             wxLogError( _("DIB Header: Image height > 32767 pixels for file.") );

+        }

         return false;
     }
 
         return false;
     }
 


@@ -916,7 +986,9 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
     {
         if (verbose)
     if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
     {
         if (verbose)

+        {

             wxLogError( _("DIB Header: Unknown bitdepth in file.") );
             wxLogError( _("DIB Header: Unknown bitdepth in file.") );

+        }

         return false;
     }
 
         return false;
     }
 


@@ -926,7 +998,9 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
          comp != BI_BITFIELDS )
     {
         if (verbose)
          comp != BI_BITFIELDS )
     {
         if (verbose)

+        {

             wxLogError( _("DIB Header: Unknown encoding in file.") );
             wxLogError( _("DIB Header: Unknown encoding in file.") );

+        }

         return false;
     }
 
         return false;
     }
 


@@ -941,7 +1015,9 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
         ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
     {
         if (verbose)
         ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
     {
         if (verbose)

+        {

             wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") );
             wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") );

+        }

         return false;
     }
 
         return false;
     }
 


@@ -950,7 +1026,9 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
                     verbose, IsBmp, true) )
     {
         if (verbose)
                     verbose, IsBmp, true) )
     {
         if (verbose)

+        {

             wxLogError( _("Error in reading image DIB.") );
             wxLogError( _("Error in reading image DIB.") );

+        }

         return false;
     }
 
         return false;
     }
 


@@ -963,7 +1041,9 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
                         verbose, IsBmp, false) )
         {
             if (verbose)
                         verbose, IsBmp, false) )
         {
             if (verbose)

+            {

                 wxLogError( _("ICO: Error in reading mask DIB.") );
                 wxLogError( _("ICO: Error in reading mask DIB.") );

+            }

             return false;
         }
         image->SetMaskFromImage(mask, 255, 255, 255);
             return false;
         }
         image->SetMaskFromImage(mask, 255, 255, 255);


@@ -989,7 +1069,7 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
 {
     unsigned char hdr[2];
 
 {
     unsigned char hdr[2];
 

-    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here

         return false;
 
     // do we have the BMP file signature?
         return false;
 
     // do we have the BMP file signature?


@@ -1041,13 +1121,17 @@ bool wxICOHandler::SaveFile(wxImage *image,
     if ( image->GetHeight () > 127 )
     {
         if ( verbose )
     if ( image->GetHeight () > 127 )
     {
         if ( verbose )

+        {

             wxLogError(_("ICO: Image too tall for an icon."));
             wxLogError(_("ICO: Image too tall for an icon."));

+        }

         return false;
     }
     if ( image->GetWidth () > 255 )
     {
         if ( verbose )
         return false;
     }
     if ( image->GetWidth () > 255 )
     {
         if ( verbose )

+        {

             wxLogError(_("ICO: Image too wide for an icon."));
             wxLogError(_("ICO: Image too wide for an icon."));

+        }

         return false;
     }
 
         return false;
     }
 


@@ -1073,7 +1157,9 @@ bool wxICOHandler::SaveFile(wxImage *image,
     if ( !stream.IsOk() )
     {
         if ( verbose )
     if ( !stream.IsOk() )
     {
         if ( verbose )

+        {

             wxLogError(_("ICO: Error writing the image file!"));
             wxLogError(_("ICO: Error writing the image file!"));

+        }

         return false;
     }
 
         return false;
     }
 


@@ -1132,7 +1218,9 @@ bool wxICOHandler::SaveFile(wxImage *image,
         if ( !bResult )
         {
             if ( verbose )
         if ( !bResult )
         {
             if ( verbose )

+            {

                 wxLogError(_("ICO: Error writing the image file!"));
                 wxLogError(_("ICO: Error writing the image file!"));

+            }

             return false;
         }
         IsMask = true;
             return false;
         }
         IsMask = true;


@@ -1141,7 +1229,9 @@ bool wxICOHandler::SaveFile(wxImage *image,
         if ( !bResult )
         {
             if ( verbose )
         if ( !bResult )
         {
             if ( verbose )

+            {

                 wxLogError(_("ICO: Error writing the image file!"));
                 wxLogError(_("ICO: Error writing the image file!"));

+            }

             return false;
         }
         wxUint32 Size = cStream.GetSize();
             return false;
         }
         wxUint32 Size = cStream.GetSize();


@@ -1152,7 +1242,9 @@ bool wxICOHandler::SaveFile(wxImage *image,
         if ( !cStream.Ok() )
         {
             if ( verbose )
         if ( !cStream.Ok() )
         {
             if ( verbose )

+            {

                 wxLogError(_("ICO: Error writing the image file!"));
                 wxLogError(_("ICO: Error writing the image file!"));

+            }

             return false;
         }
 #endif // 0
             return false;
         }
 #endif // 0


@@ -1196,7 +1288,9 @@ bool wxICOHandler::SaveFile(wxImage *image,
         if ( !stream.IsOk() )
         {
             if ( verbose )
         if ( !stream.IsOk() )
         {
             if ( verbose )

+            {

                 wxLogError(_("ICO: Error writing the image file!"));
                 wxLogError(_("ICO: Error writing the image file!"));

+            }

             return false;
         }
 
             return false;
         }
 


@@ -1206,7 +1300,9 @@ bool wxICOHandler::SaveFile(wxImage *image,
         if ( !bResult )
         {
             if ( verbose )
         if ( !bResult )
         {
             if ( verbose )

+            {

                 wxLogError(_("ICO: Error writing the image file!"));
                 wxLogError(_("ICO: Error writing the image file!"));

+            }

             return false;
         }
         IsMask = true;
             return false;
         }
         IsMask = true;


@@ -1215,7 +1311,9 @@ bool wxICOHandler::SaveFile(wxImage *image,
         if ( !bResult )
         {
             if ( verbose )
         if ( !bResult )
         {
             if ( verbose )

+            {

                 wxLogError(_("ICO: Error writing the image file!"));
                 wxLogError(_("ICO: Error writing the image file!"));

+            }

             return false;
         }
 
             return false;
         }
 


@@ -1227,7 +1325,6 @@ bool wxICOHandler::SaveFile(wxImage *image,
 bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
                             bool verbose, int index)
 {
 bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
                             bool verbose, int index)
 {

-    stream.SeekI(0);

     return DoLoadFile(image, stream, verbose, index);
 }
 
     return DoLoadFile(image, stream, verbose, index);
 }
 


@@ -1239,9 +1336,9 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
 
     ICONDIR IconDir;
 
 
     ICONDIR IconDir;
 

-    wxFileOffset iPos = stream.TellI();

     stream.Read(&IconDir, sizeof(IconDir));
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
     stream.Read(&IconDir, sizeof(IconDir));
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);

+

     // nType is 1 for Icons, 2 for Cursors:
     wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
 
     // nType is 1 for Icons, 2 for Cursors:
     wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
 


@@ -1252,9 +1349,13 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
     int colmax = 0;
     int iSel = wxNOT_FOUND;
 
     int colmax = 0;
     int iSel = wxNOT_FOUND;
 

-    for (int i = 0; i < nIcons; i++ )
+    // remember how many bytes we read from the stream:
+    wxFileOffset alreadySeeked = sizeof(IconDir);
+
+    for (unsigned int i = 0; i < nIcons; i++ )

     {
     {

-        stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY));
+        alreadySeeked += stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY)).LastRead();
+

         // bHeight and bColorCount are wxUint8
         if ( pCurrentEntry->bWidth >= wMax )
         {
         // bHeight and bColorCount are wxUint8
         if ( pCurrentEntry->bWidth >= wMax )
         {


@@ -1268,6 +1369,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
                 colmax = pCurrentEntry->bColorCount;
             }
         }
                 colmax = pCurrentEntry->bColorCount;
             }
         }

+

         pCurrentEntry++;
     }
 
         pCurrentEntry++;
     }
 


@@ -1287,7 +1389,13 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
     {
         // seek to selected icon:
         pCurrentEntry = pIconDirEntry + iSel;
     {
         // seek to selected icon:
         pCurrentEntry = pIconDirEntry + iSel;

-        stream.SeekI(iPos + wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset), wxFromStart);
+
+        // NOTE: seeking a positive amount in wxFromCurrent mode allows us to
+        //       load even non-seekable streams (see wxInputStream::SeekI docs)!
+        wxFileOffset offset = wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset) - alreadySeeked;
+        if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset)
+            return false;
+

         bResult = LoadDib(image, stream, true, IsBmp);
         bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
         if ( bResult && bIsCursorType && nType == 2 )
         bResult = LoadDib(image, stream, true, IsBmp);
         bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
         if ( bResult && bIsCursorType && nType == 2 )


@@ -1297,26 +1405,27 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
             image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
         }
     }
             image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
         }
     }

-    delete[] pIconDirEntry;
+
+    delete [] pIconDirEntry;
+

     return bResult;
 }
 
     return bResult;
 }
 

-int wxICOHandler::GetImageCount(wxInputStream& stream)
+int wxICOHandler::DoGetImageCount(wxInputStream& stream)

 {
     ICONDIR IconDir;
 {
     ICONDIR IconDir;

-    wxFileOffset iPos = stream.TellI();
-    stream.SeekI(0);
-    stream.Read(&IconDir, sizeof(IconDir));
-    wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
-    stream.SeekI(iPos);
-    return (int)nIcons;
+
+    if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir))
+             // it's ok to modify the stream position here
+        return 0;
+
+    return (int)wxUINT16_SWAP_ON_BE(IconDir.idCount);

 }
 
 bool wxICOHandler::DoCanRead(wxInputStream& stream)
 {
 }
 
 bool wxICOHandler::DoCanRead(wxInputStream& stream)
 {

-    stream.SeekI(0);

     unsigned char hdr[4];
     unsigned char hdr[4];

-    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here

         return false;
 
     // hdr[2] is one for an icon and two for a cursor
         return false;
 
     // hdr[2] is one for an icon and two for a cursor


@@ -1336,9 +1445,8 @@ 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];

-    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here

         return false;
 
     // hdr[2] is one for an icon and two for a cursor
         return false;
 
     // hdr[2] is one for an icon and two for a cursor


@@ -1369,12 +1477,13 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
 {
     wxANIDecoder decod;
     return decod.CanRead(stream);
 {
     wxANIDecoder decod;
     return decod.CanRead(stream);

+             // it's ok to modify the stream position here

 }
 
 }
 

-int wxANIHandler::GetImageCount(wxInputStream& stream)
+int wxANIHandler::DoGetImageCount(wxInputStream& stream)

 {
     wxANIDecoder decoder;
 {
     wxANIDecoder decoder;

-    if (!decoder.Load(stream))
+    if (!decoder.Load(stream))  // it's ok to modify the stream position here

         return wxNOT_FOUND;
 
     return decoder.GetFrameCount();
         return wxNOT_FOUND;
 
     return decoder.GetFrameCount();