Made .dsp files consistent with debug option; added JPEG project file

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index c6a775e15cde7d2294bc697557870c731bd1c595..32f0539bc22395b2117abec3e6adda227c76426b 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -1,15 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imaggif.cpp
 // Purpose:     wxGIFHandler
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imaggif.cpp
 // Purpose:     wxGIFHandler

-// Author:      Vaclav Slavik
-//              Based on wxGIFDecoder by Guillermo Rodriguez Garcia
+// Author:      Vaclav Slavik & Guillermo Rodriguez Garcia

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

+// Copyright:   (c) 1999 Vaclav Slavik & Guillermo Rodriguez Garcia

 // 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
+  We don't put pragma implement in this file because it is already present in
+  src/common/image.cpp

 */
 
 // For compilers that support precompilation, includes "wx.h".
 */
 
 // For compilers that support precompilation, includes "wx.h".


@@ -23,31 +23,42 @@ src/common/image.cpp
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

+#if wxUSE_GIF
+

 #include "wx/image.h"
 #include "wx/image.h"

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

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

-#include "wx/module.h"

 #include "wx/log.h"
 
 #include "wx/log.h"
 

+#if !USE_SHARED_LIBRARIES

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

-
-#if wxUSE_STREAMS
+#endif

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

-bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSED(verbose) )
+#if wxUSE_STREAMS
+
+bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )

 {
     wxGIFDecoder *decod;
 {
     wxGIFDecoder *decod;

+    int error;

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

-    
-    if (decod->ReadGIF() != E_OK)
-    {
-        wxLogDebug(_T("Error reading GIF"));
+
+    if ((error = decod->ReadGIF()) != E_OK)
+    {   
+        if (verbose)
+        {
+            switch (error)
+            {
+                case E_FORMATO: wxLogError(T("wxGIFHandler: error in image format")); break;
+                case E_MEMORIA: wxLogError(T("wxGIFHandler: couldn't allocate memory")); break;
+                default:        wxLogError(T("wxGIFHandler: unknown error !!!"));
+            }
+        }

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


@@ -62,17 +73,24 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
 bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
 bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {

-    if (verbose) wxLogDebug(_T("wxGIFHandler is read-only!!"));
+    if (verbose)
+        wxLogDebug(T("wxGIFHandler is read-only!!"));
+

     return FALSE;
 }
 
 bool wxGIFHandler::CanRead( wxInputStream& stream )
 {
     return FALSE;
 }
 
 bool wxGIFHandler::CanRead( wxInputStream& stream )
 {

-    unsigned char hdr[5];
-    
-    stream.Read(&hdr, 5);
-    stream.SeekI(-5, wxFromCurrent);
-    return (hdr[0] == 'G' && hdr[1] == 'I' && hdr[2] == 'F' && hdr[3] == '8' && hdr[4] == '9');
+    wxGIFDecoder *decod;
+    bool ok;
+
+    decod = new wxGIFDecoder(&stream);
+    ok = decod->CanRead();
+
+    delete decod;
+    return ok;

 }
 
 }
 

-#endif
+#endif  // wxUSE_STREAMS
+
+#endif  // wxUSE_GIF