Optimized for performance.

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 7b3e5ba0df582ee1596d50802d092ba5e55543da..eec1778dcbb5380df81ddad94a34a1f65ec59a98 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -13,7 +13,7 @@
 */
 
 // For compilers that support precompilation, includes "wx.h".
 */
 
 // For compilers that support precompilation, includes "wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #  pragma hdrstop
 
 #ifdef __BORLANDC__
 #  pragma hdrstop


@@ -23,12 +23,13 @@
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#if wxUSE_STREAMS && wxUSE_GIF
+#if wxUSE_GIF

 
 #include "wx/image.h"
 #include "wx/gifdecod.h"
 #include "wx/wfstream.h"
 #include "wx/log.h"
 
 #include "wx/image.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)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)


@@ -38,7 +39,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 

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

 {
     wxGIFDecoder *decod;
     int error;
 {
     wxGIFDecoder *decod;
     int error;


@@ -47,14 +50,14 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     decod = new wxGIFDecoder(&stream, TRUE);
 
     if ((error = decod->ReadGIF()) != E_OK)
     decod = new wxGIFDecoder(&stream, TRUE);
 
     if ((error = decod->ReadGIF()) != E_OK)

-    {   
+    {

         if (verbose)
         {
             switch (error)
             {
         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 !!!"));
+                case E_FORMATO: wxLogError(_("GIF: Error in image format.")); break;
+                case E_MEMORIA: wxLogError(_("GIF: Couldn't allocate memory.")); break;
+                default:        wxLogError(_("GIF: Unknown error."));

             }
         }
         delete decod;
             }
         }
         delete decod;


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

-        wxLogDebug(_T("wxGIFHandler is read-only!!"));
+        wxLogDebug(wxT("wxGIFHandler is read-only!!"));

 
     return FALSE;
 }
 
 
     return FALSE;
 }
 

-bool wxGIFHandler::CanRead( wxInputStream& stream )
+bool wxGIFHandler::DoCanRead( wxInputStream& stream )

 {
     wxGIFDecoder *decod;
     bool ok;
 {
     wxGIFDecoder *decod;
     bool ok;


@@ -89,4 +92,6 @@ bool wxGIFHandler::CanRead( wxInputStream& stream )
     return ok;
 }
 
     return ok;
 }
 

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