removing unreached code (overriden)

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

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index fe1b7172fcf096a71f83dad65610f3bc9e85d0ac..0ff3f128f5263ef44ade8ed18a3efd2476a42941 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "imagtiff.h"
 #endif
 
 #pragma implementation "imagtiff.h"
 #endif
 


@@ -37,21 +37,30 @@ extern "C"
 #include "wx/intl.h"
 #include "wx/module.h"
 
 #include "wx/intl.h"
 #include "wx/module.h"
 

+#ifndef TIFFLINKAGEMODE
+  #define TIFFLINKAGEMODE LINKAGEMODE
+#endif
+

 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 
 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 

-static tsize_t
+#if wxUSE_STREAMS
+
+extern "C"
+{
+
+tsize_t TIFFLINKAGEMODE

 _tiffNullProc(thandle_t WXUNUSED(handle),
 _tiffNullProc(thandle_t WXUNUSED(handle),

-             tdata_t WXUNUSED(buf),
-             tsize_t WXUNUSED(size))
+          tdata_t WXUNUSED(buf),
+          tsize_t WXUNUSED(size))

 {
     return (tsize_t) -1;
 }
 
 {
     return (tsize_t) -1;
 }
 

-static tsize_t
+tsize_t TIFFLINKAGEMODE

 _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;
 _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;


@@ -59,7 +68,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
     return stream->LastRead();
 }
 
     return stream->LastRead();
 }
 

-static tsize_t
+tsize_t TIFFLINKAGEMODE

 _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
 _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;


@@ -67,7 +76,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
     return stream->LastWrite();
 }
 
     return stream->LastWrite();
 }
 

-static toff_t
+toff_t TIFFLINKAGEMODE

 _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
 {
     wxInputStream *stream = (wxInputStream*) handle;
 _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
 {
     wxInputStream *stream = (wxInputStream*) handle;


@@ -83,7 +92,7 @@ _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
     return (toff_t)stream->SeekI( (off_t)off, mode );
 }
 
     return (toff_t)stream->SeekI( (off_t)off, mode );
 }
 

-static toff_t
+toff_t TIFFLINKAGEMODE

 _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
 _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;


@@ -99,20 +108,20 @@ _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
     return (toff_t)stream->SeekO( (off_t)off, mode );
 }
 
     return (toff_t)stream->SeekO( (off_t)off, mode );
 }
 

-static int
+int TIFFLINKAGEMODE

 _tiffCloseProc(thandle_t WXUNUSED(handle))
 {
     return 0;  // ?
 }
 
 _tiffCloseProc(thandle_t WXUNUSED(handle))
 {
     return 0;  // ?
 }
 

-static toff_t
+toff_t TIFFLINKAGEMODE

 _tiffSizeProc(thandle_t handle)
 {
     wxStreamBase *stream = (wxStreamBase*) handle;
     return (toff_t) stream->GetSize();
 }
 
 _tiffSizeProc(thandle_t handle)
 {
     wxStreamBase *stream = (wxStreamBase*) handle;
     return (toff_t) stream->GetSize();
 }
 

-static int
+int TIFFLINKAGEMODE

 _tiffMapProc(thandle_t WXUNUSED(handle),
              tdata_t* WXUNUSED(pbase),
              toff_t* WXUNUSED(psize))
 _tiffMapProc(thandle_t WXUNUSED(handle),
              tdata_t* WXUNUSED(pbase),
              toff_t* WXUNUSED(psize))


@@ -120,13 +129,31 @@ _tiffMapProc(thandle_t WXUNUSED(handle),
     return 0;
 }
 
     return 0;
 }
 

-static void
+void TIFFLINKAGEMODE

 _tiffUnmapProc(thandle_t WXUNUSED(handle),
                tdata_t WXUNUSED(base),
                toff_t WXUNUSED(size))
 {
 }
 
 _tiffUnmapProc(thandle_t WXUNUSED(handle),
                tdata_t WXUNUSED(base),
                toff_t WXUNUSED(size))
 {
 }
 

+static void
+TIFFwxWarningHandler(const char* module, const char* fmt, va_list ap)
+{
+    if (module != NULL)
+            wxLogWarning(_("tiff module: %s"), module);
+    wxLogWarning((wxChar *) fmt, ap);
+}
+ 
+static void
+TIFFwxErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+    if (module != NULL)
+            wxLogError(_("tiff module: %s"), module);
+    wxVLogError((wxChar *) fmt, ap);
+}
+
+} // extern "C"
+

 TIFF*
 TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
 {
 TIFF*
 TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
 {


@@ -151,8 +178,21 @@ TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
     return tif;
 }
 
     return tif;
 }
 

+wxTIFFHandler::wxTIFFHandler()
+{
+    m_name = wxT("TIFF file");
+    m_extension = wxT("tif");
+    m_type = wxBITMAP_TYPE_TIF;
+    m_mime = wxT("image/tiff");
+    TIFFSetWarningHandler((TIFFErrorHandler) TIFFwxWarningHandler);
+    TIFFSetErrorHandler((TIFFErrorHandler) TIFFwxErrorHandler);
+}
+

 bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
 {
 bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
 {

+    if (index == -1)
+        index = 0;
+

     image->Destroy();
 
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );
     image->Destroy();
 
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );


@@ -190,7 +230,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     {
         if (verbose)
             wxLogError( _("TIFF: Couldn't allocate memory.") );
     {
         if (verbose)
             wxLogError( _("TIFF: Couldn't allocate memory.") );

-            
+

         TIFFClose( tif );
 
         return FALSE;
         TIFFClose( tif );
 
         return FALSE;


@@ -301,11 +341,11 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
     TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
     TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_LZW);
     TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
     TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
     TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_LZW);

-    
+

     tsize_t linebytes = (tsize_t)image->GetWidth() * 3;
     unsigned char *buf;
     tsize_t linebytes = (tsize_t)image->GetWidth() * 3;
     unsigned char *buf;

-    
-    if (TIFFScanlineSize(tif) > linebytes) 
+
+    if (TIFFScanlineSize(tif) > linebytes)

     {
         buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
         if (!buf)
     {
         buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
         if (!buf)


@@ -317,30 +357,30 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
 
             return FALSE;
         }
 
             return FALSE;
         }

-    } 
-    else 
+    }
+    else

     {
         buf = NULL;
     }
 
     TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,
         TIFFDefaultStripSize(tif, (uint32) -1));
     {
         buf = NULL;
     }
 
     TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,
         TIFFDefaultStripSize(tif, (uint32) -1));

-        
+

     unsigned char *ptr = image->GetData();
     unsigned char *ptr = image->GetData();

-    for (int row = 0; row < image->GetHeight(); row++) 
+    for (int row = 0; row < image->GetHeight(); row++)

     {
     {

-           if (buf)
-               memcpy(buf, ptr, image->GetWidth());
-        
-           if (TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0)
+        if (buf)
+            memcpy(buf, ptr, image->GetWidth());
+
+        if (TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0)

         {
         {

-               if (verbose)
-                   wxLogError( _("TIFF: Error writing image.") );
-        
+            if (verbose)
+                wxLogError( _("TIFF: Error writing image.") );
+

             TIFFClose( tif );
             if (buf)
                 _TIFFfree(buf);
             TIFFClose( tif );
             if (buf)
                 _TIFFfree(buf);

-                
+

             return FALSE;
         }
         ptr += image->GetWidth()*3;
             return FALSE;
         }
         ptr += image->GetWidth()*3;


@@ -358,15 +398,14 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char hdr[2];
 
 {
     unsigned char hdr[2];
 

-    stream.Read(&hdr, 2);
-    stream.SeekI(-2, wxFromCurrent);
+    if ( !stream.Read(&hdr, WXSIZEOF(hdr)) )
+        return FALSE;

 
 

-    return ((hdr[0] == 0x49 && hdr[1] == 0x49) ||
-            (hdr[0] == 0x4D && hdr[1] == 0x4D));
+    return (hdr[0] == 'I' && hdr[1] == 'I') ||
+           (hdr[0] == 'M' && hdr[1] == 'M');

 }
 
 }
 

+#endif  // wxUSE_STREAMS

 
 

-#endif
-   // wxUSE_LIBTIFF
-
+#endif  // wxUSE_LIBTIFF