Adding MSVC makefile support for building the TIFF library

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

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 474e12e3e05b5888bf59ffdacae639e92deb0a94..881870a0ce00dcad27725b6ae45a2b8116ab15f0 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -1,16 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagjpeg.cpp
-// Purpose:     wxImage JPEG handler
-// Author:      Vaclav Slavik
+// Name:        imagtiff.cpp
+// Purpose:     wxImage TIFF handler
+// Author:      Robert Roebling
 // RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik
+// Copyright:   (c) Robert Roebling
 // 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 "imagtiff.h"
+#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -23,7 +22,7 @@
 
 #if wxUSE_LIBTIFF
 
-#include "wx/image.h"
+#include "wx/imagtiff.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/log.h"
@@ -43,17 +42,14 @@ extern "C"
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
-#endif
 
 static tsize_t
 _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;
     stream->Read( (void*) buf, (size_t) size );
-    if (!*stream) return 0;
-    return size;
+    return stream->LastRead();
 }
 
 static tsize_t
@@ -61,8 +57,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
     stream->Write( (void*) buf, (size_t) size );
-    if (!*stream) return 0;
-    return size;
+    return stream->LastWrite();
 }
 
 static toff_t
@@ -91,8 +86,7 @@ static toff_t
 _tiffSizeProc(thandle_t handle)
 {
     wxInputStream *stream = (wxInputStream*) handle;
-    long fsize;
-    return ((fsize = stream->SeekI(0, wxFromEnd)) < 0 ? 0 : fsize);
+    return (toff_t) stream->GetSize();
 }
 
 static int
@@ -122,17 +116,27 @@ TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
 }
 
 
-bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
+bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
 {
     image->Destroy();
     
-    TIFF *tif = TIFFwxOpen( stream, "horse.tif", "r" );
+    TIFF *tif = TIFFwxOpen( stream, "image", "r" );
     
     if (!tif)
     {
         if (verbose)
-            wxLogError( _("Error loading TIFF image.") );
+            wxLogError( _("TIFF: Error loading image.") );
+           
+       return FALSE;
+    }
+    
+    if (!TIFFSetDirectory( tif, (tdir_t)index ))
+    {
+        if (verbose)
+            wxLogError( _("Invalid TIFF image index.") );
            
+        TIFFClose( tif );
+       
        return FALSE;
     }
 
@@ -150,7 +154,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     if (!raster)
     {
         if (verbose)
-            wxLogError( _("Not enough memory for loading TIFF image.") );
+            wxLogError( _("TIFF: Couldn't allocate memory.") );
            
        return FALSE;
     }
@@ -159,7 +163,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     if (!image->Ok()) 
     {
         if (verbose)
-            wxLogError( _("Not enough memory for loading TIFF image.") );
+            wxLogError( _("TIFF: Couldn't allocate memory.") );
            
        _TIFFfree( raster );
        
@@ -169,7 +173,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
     {
         if (verbose)
-            wxLogError( _("Error reading TIFF image.") );
+            wxLogError( _("TIFF: Error reading image.") );
            
        _TIFFfree( raster );
        image->Destroy();
@@ -219,24 +223,37 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     return TRUE;
 }
 
+int wxTIFFHandler::GetImageCount( wxInputStream& stream )
+{
+    TIFF *tif = TIFFwxOpen( stream, "image", "r" );
+    
+    if (!tif)
+       return 0;
 
+    int dircount = 0;  // according to the libtiff docs, dircount should be set to 1 here???
+    do {
+        dircount++;
+    } while (TIFFReadDirectory(tif));
+    
+    TIFFClose( tif );
+    
+    return dircount;
+}
 
-bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
+bool wxTIFFHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
 {
     return FALSE;
 }
 
 bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
 {
-    return TRUE;
+    unsigned char hdr[2];
 
-/*
-    unsigned char hdr[4];
-
-    stream.Read(&hdr, 4);
-    stream.SeekI(-4, wxFromCurrent);
-    return (hdr[0] == 'T' && hdr[1] == 'I' && hdr[2] == 'F' && hdr[3] == 'F');
-*/
+    stream.Read(&hdr, 2);
+    stream.SeekI(-2, wxFromCurrent);
+    
+    return ((hdr[0] == 0x49 && hdr[1] == 0x49) ||
+            (hdr[0] == 0x4D && hdr[1] == 0x4D));
 }