TIFF code 2.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index c5a9eb383c06ba61a9be3e99afc4b082f2e1e858..ec8bf996c1e76dec1498c50a4f678cc6c8588dbb 100644 (file)
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -38,6 +38,9 @@ void wxInitAllImageHandlers()
 #if wxUSE_LIBJPEG
   wxImage::AddHandler( new wxJPEGHandler );
 #endif
+#if wxUSE_LIBTIFF
+  wxImage::AddHandler( new wxTIFFHandler );
+#endif
 #if wxUSE_GIF
   wxImage::AddHandler( new wxGIFHandler );
 #endif

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
new file mode 100644 (file)
index 0000000..474e12e
--- /dev/null
+++ b/src/common/imagtiff.cpp
@@ -0,0 +1,250 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagjpeg.cpp
+// Purpose:     wxImage JPEG handler
+// Author:      Vaclav Slavik
+// RCS-ID:      $Id$
+// Copyright:   (c) Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/*
+   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".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include "wx/defs.h"
+
+#if wxUSE_LIBTIFF
+
+#include "wx/image.h"
+#include "wx/bitmap.h"
+#include "wx/debug.h"
+#include "wx/log.h"
+#include "wx/app.h"
+extern "C"
+{
+    #include "tiff.h"
+    #include "tiffio.h"
+    #include "tiffiop.h"
+}
+#include "wx/filefn.h"
+#include "wx/wfstream.h"
+#include "wx/intl.h"
+#include "wx/module.h"
+
+//-----------------------------------------------------------------------------
+// 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;
+}
+
+static tsize_t
+_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;
+}
+
+static toff_t
+_tiffSeekProc(thandle_t handle, toff_t off, int whence)
+{
+    wxInputStream *stream = (wxInputStream*) handle;
+    wxSeekMode mode;
+    switch (whence)
+    {
+        case SEEK_SET: mode = wxFromStart; break;
+        case SEEK_CUR: mode = wxFromCurrent; break;
+        case SEEK_END: mode = wxFromEnd; break;
+        default:       mode = wxFromCurrent; break;
+    }
+    
+    return (toff_t)stream->SeekI( (off_t)off, mode );
+}
+
+static int
+_tiffCloseProc(thandle_t WXUNUSED(handle))
+{
+    return 0;  // ?
+}
+
+static toff_t
+_tiffSizeProc(thandle_t handle)
+{
+    wxInputStream *stream = (wxInputStream*) handle;
+    long fsize;
+    return ((fsize = stream->SeekI(0, wxFromEnd)) < 0 ? 0 : fsize);
+}
+
+static int
+_tiffMapProc(thandle_t WXUNUSED(handle), tdata_t* pbase, toff_t* psize)
+{
+    return 0;
+}
+
+static void
+_tiffUnmapProc(thandle_t WXUNUSED(handle), tdata_t base, toff_t size)
+{
+}
+
+TIFF*
+TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
+{
+    TIFF* tif = TIFFClientOpen(name, mode,
+        (thandle_t) &stream,
+        _tiffReadProc, _tiffWriteProc,
+        _tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
+        _tiffMapProc, _tiffUnmapProc);
+
+    if (tif)
+        tif->tif_fd = (int) &stream;
+       
+    return tif;
+}
+
+
+bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
+{
+    image->Destroy();
+    
+    TIFF *tif = TIFFwxOpen( stream, "horse.tif", "r" );
+    
+    if (!tif)
+    {
+        if (verbose)
+            wxLogError( _("Error loading TIFF image.") );
+           
+       return FALSE;
+    }
+
+    uint32 w, h;
+    size_t npixels;
+    uint32 *raster;
+    
+    TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
+    TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &h );
+    
+    npixels = w * h;
+    
+    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
+    
+    if (!raster)
+    {
+        if (verbose)
+            wxLogError( _("Not enough memory for loading TIFF image.") );
+           
+       return FALSE;
+    }
+
+    image->Create( w, h );
+    if (!image->Ok()) 
+    {
+        if (verbose)
+            wxLogError( _("Not enough memory for loading TIFF image.") );
+           
+       _TIFFfree( raster );
+       
+        return FALSE;
+    }
+    
+    if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
+    {
+        if (verbose)
+            wxLogError( _("Error reading TIFF image.") );
+           
+       _TIFFfree( raster );
+       image->Destroy();
+       
+       return FALSE;
+    }
+    
+    bool hasmask = FALSE;
+    
+    unsigned char *ptr = image->GetData();
+    uint32 pos = 0;
+    
+    for (uint32 i = 0; i < h; i++)
+    {
+        for (uint32 j = 0; w < h; j++)
+       {
+           unsigned char alpha = (unsigned char)(raster[pos] >> 24);
+           if (alpha < 127)
+           {
+               hasmask = TRUE;
+               ptr[0] = image->GetMaskRed();
+               ptr++;
+               ptr[0] = image->GetMaskGreen();
+               ptr++;
+               ptr[0] = image->GetMaskBlue();
+               ptr++;
+           }
+           else
+           {
+               ptr[0] = (unsigned char)(raster[pos] >> 16);
+               ptr++;
+               ptr[0] = (unsigned char)(raster[pos] >> 8);
+               ptr++;
+               ptr[0] = (unsigned char)(raster[pos]);
+               ptr++;
+           }
+           pos++;
+       }
+    }
+    
+    _TIFFfree( raster );
+    
+    TIFFClose( tif );
+       
+    image->SetMask( hasmask );
+    
+    return TRUE;
+}
+
+
+
+bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
+{
+    return FALSE;
+}
+
+bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
+{
+    return TRUE;
+
+/*
+    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');
+*/
+}
+
+
+#endif
+   // wxUSE_LIBTIFF
+
+
+
+
+
+