X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8141573c1ed2d7f02b201c7b78f32ffca2925eeb..124193837f27d1fb75b9607f0e005b9897d1e320:/src/common/imaggif.cpp

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 74e573df34..b8a5229e23 100644
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -22,7 +22,7 @@
 #  include "wx/defs.h"
 #endif
 
-#if wxUSE_GIF
+#if wxUSE_IMAGE && wxUSE_GIF
 
 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"
@@ -44,6 +44,7 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     int error;
     bool ok;
 
+//    image->Destroy();
     decod = new wxGIFDecoder(&stream, TRUE);
     error = decod->ReadGIF();
 
@@ -54,13 +55,13 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             switch (error)
             {
                 case wxGIF_INVFORMAT:
-                    wxLogError(_("wxGIFHandler: error in GIF image format."));
+                    wxLogError(_("GIF: error in GIF image format."));
                     break;
                 case wxGIF_MEMERR:
-                    wxLogError(_("wxGIFHandler: not enough memory."));
+                    wxLogError(_("GIF: not enough memory."));
                     break;
                 default:
-                    wxLogError(_("wxGIFHandler: unknown error!!!"));
+                    wxLogError(_("GIF: unknown error!!!"));
                     break;
             }
         }
@@ -70,14 +71,13 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
 
     if ((error == wxGIF_TRUNCATED) && verbose)
     {
-        wxLogWarning(_("wxGIFHandler: data stream seems to be truncated."));
+        wxLogError(_("GIF: data stream seems to be truncated."));
         /* go on; image data is OK */
     }
 
-    image->Destroy();
     ok = decod->ConvertToImage(image);
-
     delete decod;
+
     return ok;
 }
 
@@ -85,7 +85,7 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)
-        wxLogDebug(wxT("wxGIFHandler is read-only!!"));
+        wxLogDebug(wxT("GIF: the handler is read-only!!"));
 
     return FALSE;
 }
@@ -97,8 +97,8 @@ bool wxGIFHandler::DoCanRead( wxInputStream& stream )
 
     decod = new wxGIFDecoder(&stream);
     ok = decod->CanRead();
-
     delete decod;
+
     return ok;
 }