X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b72db08a78016b2cf89a454b307fb71942e8704..f2c2fa4d62b34608e21b04f8010149945aebda70:/src/common/imagtiff.cpp

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 1ca0a0d0f7..881870a0ce 100644
--- 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,9 +42,7 @@ 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)
@@ -119,7 +116,7 @@ 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();
     
@@ -128,10 +125,20 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     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;
+    }
 
     uint32 w, h;
     size_t npixels;
@@ -147,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;
     }
@@ -156,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 );
 	
@@ -166,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();
@@ -216,9 +223,24 @@ 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;
 }