fix wxIconBundle creation from multiimage files broken by r60852

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 825a6431e645c8f3670f452fedbaf5774b5cb90e..8fa0ccd441d5f665d6832fcb47305d5bf293a71a 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -26,6 +26,8 @@
     #include "wx/stream.h"
 #endif
 
     #include "wx/stream.h"
 #endif
 

+#include "wx/wfstream.h"
+

 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxIconArray)
 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxIconArray)
 


@@ -96,31 +98,43 @@ namespace
 // Adds icon from 'input' to the bundle. Shows 'errorMessage' on failure
 // (it must contain "%d", because it is used to report # of image in the file
 // that failed to load):
 // Adds icon from 'input' to the bundle. Shows 'errorMessage' on failure
 // (it must contain "%d", because it is used to report # of image in the file
 // that failed to load):

-template<typename T>

 void DoAddIcon(wxIconBundle& bundle,
 void DoAddIcon(wxIconBundle& bundle,

-               T& input, wxBitmapType type,
+               wxInputStream& input,
+               wxBitmapType type,

                const wxString& errorMessage)
 {
                const wxString& errorMessage)
 {

-#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)

     wxImage image;
 
     wxImage image;
 

+    const wxFileOffset posOrig = input.TellI();
+

     const size_t count = wxImage::GetImageCount(input, type);
     for ( size_t i = 0; i < count; ++i )
     {
     const size_t count = wxImage::GetImageCount(input, type);
     for ( size_t i = 0; i < count; ++i )
     {

+        if ( i )
+        {
+            // the call to LoadFile() for the first sub-image updated the
+            // stream position but we need to start reading the subsequent
+            // sub-image at the image beginning too
+            input.SeekI(posOrig);
+        }
+

         if ( !image.LoadFile(input, type, i) )
         {
             wxLogError(errorMessage, i);
             continue;
         }
 
         if ( !image.LoadFile(input, type, i) )
         {
             wxLogError(errorMessage, i);
             continue;
         }
 

+        if ( type == wxBITMAP_TYPE_ANY )
+        {
+            // store the type so that we don't need to try all handlers again
+            // for the subsequent images, they should all be of the same type
+            type = image.GetType();
+        }
+

         wxIcon tmp;
         tmp.CopyFromBitmap(wxBitmap(image));
         bundle.AddIcon(tmp);
     }
         wxIcon tmp;
         tmp.CopyFromBitmap(wxBitmap(image));
         bundle.AddIcon(tmp);
     }

-#else // !wxUSE_IMAGE
-    wxUnusedVar(input);
-    wxUnusedVar(type);
-#endif // wxUSE_IMAGE/!wxUSE_IMAGE

 }
 
 } // anonymous namespace
 }
 
 } // anonymous namespace


@@ -140,10 +154,11 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
     }
 #endif // __WXMAC__
 
     }
 #endif // __WXMAC__
 

+    wxFFileInputStream stream(file);

     DoAddIcon
     (
         *this,
     DoAddIcon
     (
         *this,

-        file, type,
+        stream, type,

         wxString::Format(_("Failed to load image %%d from file '%s'."), file)
     );
 }
         wxString::Format(_("Failed to load image %%d from file '%s'."), file)
     );
 }