fix for DLL build: wxEvtHandlerArray should be in wxBase as it's used by wxEventLoopB...

[wxWidgets.git] / src / gtk / animate.cpp

diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp
index c6f7abe951466dd3e15bf5bf4609750ee604b3f7..1975fcf5d068599957fe1541f8f2a060c3ba37c6 100644 (file)
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -116,7 +116,8 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
     else
         loader = gdk_pixbuf_loader_new();
 
     else
         loader = gdk_pixbuf_loader_new();
 

-    if (!loader)
+    if (!loader ||
+        error != NULL)  // even if the loader was allocated, an error could have happened

     {
         wxLogDebug(wxT("Could not create the loader for '%s' animation type: %s"),
                    anim_type, error->message);
     {
         wxLogDebug(wxT("Could not create the loader for '%s' animation type: %s"),
                    anim_type, error->message);


@@ -127,21 +128,40 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
     g_signal_connect(loader, "area-updated", G_CALLBACK(gdk_pixbuf_area_updated), this);
 
     guchar buf[2048];
     g_signal_connect(loader, "area-updated", G_CALLBACK(gdk_pixbuf_area_updated), this);
 
     guchar buf[2048];

+    bool data_written = false;

     while (stream.IsOk())
     {
         // read a chunk of data
     while (stream.IsOk())
     {
         // read a chunk of data

-        stream.Read(buf, sizeof(buf));
+        if (!stream.Read(buf, sizeof(buf)) &&
+            stream.GetLastError() != wxSTREAM_EOF)   // EOF is OK for now
+        {
+            // gdk_pixbuf_loader_close wants the GError == NULL
+            gdk_pixbuf_loader_close(loader, NULL);
+            return false;
+        }

 
         // fetch all data into the loader
         if (!gdk_pixbuf_loader_write(loader, buf, stream.LastRead(), &error))
         {
 
         // fetch all data into the loader
         if (!gdk_pixbuf_loader_write(loader, buf, stream.LastRead(), &error))
         {

-            gdk_pixbuf_loader_close(loader, &error);

             wxLogDebug(wxT("Could not write to the loader: %s"), error->message);
             wxLogDebug(wxT("Could not write to the loader: %s"), error->message);

+
+            // gdk_pixbuf_loader_close wants the GError == NULL
+            gdk_pixbuf_loader_close(loader, NULL);

             return false;
         }
             return false;
         }

+
+        data_written = true;

     }
 
     }
 

-    // load complete
+    if (!data_written)
+    {
+        wxLogDebug("Could not read data from the stream...");
+        return false;
+    }
+
+    // load complete: gdk_pixbuf_loader_close will now check if the data we
+    // wrote inside the pixbuf loader does make sense and will give an error
+    // if it doesn't (because of a truncated file, corrupted data or whatelse)

     if (!gdk_pixbuf_loader_close(loader, &error))
     {
         wxLogDebug(wxT("Could not close the loader: %s"), error->message);
     if (!gdk_pixbuf_loader_close(loader, &error))
     {
         wxLogDebug(wxT("Could not close the loader: %s"), error->message);


@@ -149,7 +169,7 @@ bool wxAnimation::Load(wxInputStream &stream, wxAnimationType type)
     }
 
     // wait until we get the last area_updated signal
     }
 
     // wait until we get the last area_updated signal

-    return true;
+    return data_written;

 }
 
 wxImage wxAnimation::GetFrame(unsigned int WXUNUSED(frame)) const
 }
 
 wxImage wxAnimation::GetFrame(unsigned int WXUNUSED(frame)) const


@@ -238,6 +258,8 @@ wxAnimationCtrl::~wxAnimationCtrl()
 bool wxAnimationCtrl::LoadFile(const wxString &filename, wxAnimationType type)
 {
     wxFileInputStream fis(filename);
 bool wxAnimationCtrl::LoadFile(const wxString &filename, wxAnimationType type)
 {
     wxFileInputStream fis(filename);

+    if (!fis.IsOk())
+        return false;

     return Load(fis, type);
 }
 
     return Load(fis, type);
 }
 


@@ -341,7 +363,7 @@ void wxAnimationCtrl::DisplayStaticImage()
     if (m_bmpStaticReal.IsOk())
     {
         // show inactive bitmap
     if (m_bmpStaticReal.IsOk())
     {
         // show inactive bitmap

-        GdkBitmap *mask = (GdkBitmap *) NULL;
+        GdkBitmap *mask = NULL;

         if (m_bmpStaticReal.GetMask())
             mask = m_bmpStaticReal.GetMask()->GetBitmap();
 
         if (m_bmpStaticReal.GetMask())
             mask = m_bmpStaticReal.GetMask()->GetBitmap();