fixed some crashes

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 07a1067ca30469815187d96b1af7466042501b0a..e152a6cbda369817c9b710749e6abecc74602a00 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -44,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(_("GIF: error in GIF image format."));
+                    break;
+                case wxGIF_MEMERR:
+                    wxLogError(_("GIF: not enough memory."));
+                    break;
+                default:
+                    wxLogError(_("GIF: unknown error!!!"));
+                    break;

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

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

 
 

+    ok = decod->ConvertToImage(image);

     delete decod;
     delete decod;

+

     return ok;
 }
 
     return ok;
 }
 


@@ -72,7 +85,7 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)

-        wxLogDebug(wxT("wxGIFHandler is read-only!!"));
+        wxLogDebug(wxT("GIF: the handler is read-only!!"));

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -84,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;
 }