some != NULL checks

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 76d8c725940702b99f9627b9aa0d19ca1d49bd63..717e9673901ab0dbfbb0d0582c8078c79430e636 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -7,10 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-/*
-  We don't put pragma implement in this file because it is already present in
-  src/common/image.cpp
-*/
+#ifdef __GNUG__
+#pragma implementation "imaggif.h"
+#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -25,15 +24,13 @@
 
 #if wxUSE_GIF
 
 
 #if wxUSE_GIF
 

-#include "wx/image.h"
+#include "wx/imaggif.h"

 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)

-#endif

 
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 
 //-----------------------------------------------------------------------------
 // wxGIFHandler


@@ -47,27 +44,40 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     int error;
     bool ok;
 
     int error;
     bool ok;
 

+//    image->Destroy();

     decod = new wxGIFDecoder(&stream, TRUE);
     decod = new wxGIFDecoder(&stream, TRUE);

+    error = decod->ReadGIF();

 
 

-    if ((error = decod->ReadGIF()) != wxGIF_OK)
+    if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))

     {
         if (verbose)
         {
             switch (error)
             {
     {
         if (verbose)
         {
             switch (error)
             {

-                case wxGIF_INVFORMAT: wxLogError(_("wxGIFHandler: error in GIF image format")); break;
-                case wxGIF_MEMERR:    wxLogError(_("wxGIFHandler: couldn't allocate enough memory")); break;
-                default:              wxLogError(_("wxGIFHandler: unknown error !!!"));
+                case wxGIF_INVFORMAT:
+                    wxLogError(_("wxGIFHandler: error in GIF image format."));
+                    break;
+                case wxGIF_MEMERR:
+                    wxLogError(_("wxGIFHandler: not enough memory."));
+                    break;
+                default:
+                    wxLogError(_("wxGIFHandler: unknown error!!!"));
+                    break;

             }
         }
         delete decod;
         return FALSE;
     }
 
             }
         }
         delete decod;
         return FALSE;
     }
 

-    image->Destroy();
-    ok = decod->ConvertToImage(image);
+    if ((error == wxGIF_TRUNCATED) && verbose)
+    {
+        wxLogError(_("wxGIFHandler: data stream seems to be truncated."));
+        /* go on; image data is OK */
+    }

 
 

+    ok = decod->ConvertToImage(image);

     delete decod;
     delete decod;

+

     return ok;
 }
 
     return ok;
 }
 


@@ -87,8 +97,8 @@ bool wxGIFHandler::DoCanRead( wxInputStream& stream )
 
     decod = new wxGIFDecoder(&stream);
     ok = decod->CanRead();
 
     decod = new wxGIFDecoder(&stream);
     ok = decod->CanRead();

-

     delete decod;
     delete decod;

+

     return ok;
 }
 
     return ok;
 }