]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/imagtiff.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
filename correction
[wxWidgets.git] / src / common / imagtiff.cpp
diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index b182648068f3c2af8045c27090ca03743581d1c3..8c7d45a6fbd16fb42bb0f16e2abc474d6c8bff2a 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -1,17 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagjpeg.cpp
-// Purpose:     wxImage JPEG handler
-// Author:      Vaclav Slavik
+// Name:        src/common/imagtiff.cpp
+// Purpose:     wxImage TIFF handler
+// Author:      Robert Roebling
 // RCS-ID:      $Id$
 // RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik
+// Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -21,9 +16,9 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 
-#if wxUSE_LIBTIFF
+#if wxUSE_IMAGE && wxUSE_LIBTIFF
 
 
-#include "wx/image.h"
+#include "wx/imagtiff.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/log.h"
@@ -32,239 +27,467 @@ extern "C"
 {
     #include "tiff.h"
     #include "tiffio.h"
 {
     #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"
 
 }
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/module.h"
 
+#ifndef TIFFLINKAGEMODE
+  #define TIFFLINKAGEMODE LINKAGEMODE
+#endif
+
 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
-#endif
 
 
-static tsize_t
+#if wxUSE_STREAMS
+
+// helper to translate our, possibly 64 bit, wxFileOffset to TIFF, always 32
+// bit, toff_t
+static toff_t wxFileOffsetToTIFF(wxFileOffset ofs)
+{
+    if ( ofs == wxInvalidOffset )
+        return (toff_t)-1;
+
+    toff_t tofs = wx_truncate_cast(toff_t, ofs);
+    wxCHECK_MSG( (wxFileOffset)tofs == ofs, (toff_t)-1,
+                    _T("TIFF library doesn't support large files") );
+
+    return tofs;
+}
+
+// another helper to convert standard seek mode to our
+static wxSeekMode wxSeekModeFromTIFF(int whence)
+{
+    switch ( whence )
+    {
+        case SEEK_SET:
+            return wxFromStart;
+
+        case SEEK_CUR:
+            return wxFromCurrent;
+
+        case SEEK_END:
+            return wxFromEnd;
+
+        default:
+            return wxFromCurrent;
+    }
+}
+
+extern "C"
+{
+
+tsize_t TIFFLINKAGEMODE
+_tiffNullProc(thandle_t WXUNUSED(handle),
+          tdata_t WXUNUSED(buf),
+          tsize_t WXUNUSED(size))
+{
+    return (tsize_t) -1;
+}
+
+tsize_t TIFFLINKAGEMODE
 _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;
     stream->Read( (void*) buf, (size_t) size );
 _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;
     stream->Read( (void*) buf, (size_t) size );
-    return stream->LastRead();
+    return wx_truncate_cast(tsize_t, stream->LastRead());
 }
 
 }
 
-static tsize_t
+tsize_t TIFFLINKAGEMODE
 _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
     stream->Write( (void*) buf, (size_t) size );
 _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
     stream->Write( (void*) buf, (size_t) size );
-    return stream->LastWrite();
+    return wx_truncate_cast(tsize_t, stream->LastWrite());
 }
 
 }
 
-static toff_t
-_tiffSeekProc(thandle_t handle, toff_t off, int whence)
+toff_t TIFFLINKAGEMODE
+_tiffSeekIProc(thandle_t handle, toff_t off, int whence)
 {
     wxInputStream *stream = (wxInputStream*) handle;
 {
     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 );
+
+    return wxFileOffsetToTIFF(stream->SeekI((wxFileOffset)off,
+                                            wxSeekModeFromTIFF(whence)));
+}
+
+toff_t TIFFLINKAGEMODE
+_tiffSeekOProc(thandle_t handle, toff_t off, int whence)
+{
+    wxOutputStream *stream = (wxOutputStream*) handle;
+
+    return wxFileOffsetToTIFF(stream->SeekO((wxFileOffset)off,
+                                            wxSeekModeFromTIFF(whence)));
 }
 
 }
 
-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)
 {
 _tiffSizeProc(thandle_t handle)
 {
-    wxInputStream *stream = (wxInputStream*) handle;
+    wxStreamBase *stream = (wxStreamBase*) handle;
     return (toff_t) stream->GetSize();
 }
 
     return (toff_t) stream->GetSize();
 }
 
-static int
-_tiffMapProc(thandle_t WXUNUSED(handle), tdata_t* pbase, toff_t* psize)
+int TIFFLINKAGEMODE
+_tiffMapProc(thandle_t WXUNUSED(handle),
+             tdata_t* WXUNUSED(pbase),
+             toff_t* WXUNUSED(psize))
 {
     return 0;
 }
 
 {
     return 0;
 }
 
+void TIFFLINKAGEMODE
+_tiffUnmapProc(thandle_t WXUNUSED(handle),
+               tdata_t WXUNUSED(base),
+               toff_t WXUNUSED(size))
+{
+}
+
+static void
+TIFFwxWarningHandler(const char* module,
+                     const char* WXUNUSED_IN_UNICODE(fmt),
+                     va_list WXUNUSED_IN_UNICODE(ap))
+{
+    if (module != NULL)
+        wxLogWarning(_("tiff module: %s"), wxString::FromAscii(module).c_str());
+
+    // FIXME: this is not terrible informative but better than crashing!
+#if wxUSE_UNICODE
+    wxLogWarning(_("TIFF library warning."));
+#else
+    wxVLogWarning(fmt, ap);
+#endif
+}
+
 static void
 static void
-_tiffUnmapProc(thandle_t WXUNUSED(handle), tdata_t base, toff_t size)
+TIFFwxErrorHandler(const char* module,
+                   const char* WXUNUSED_IN_UNICODE(fmt),
+                   va_list WXUNUSED_IN_UNICODE(ap))
 {
 {
+    if (module != NULL)
+        wxLogError(_("tiff module: %s"), wxString::FromAscii(module).c_str());
+
+    // FIXME: as above
+#if wxUSE_UNICODE
+    wxLogError(_("TIFF library error."));
+#else
+    wxVLogError(fmt, ap);
+#endif
 }
 
 }
 
+} // extern "C"
+
 TIFF*
 TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
 {
     TIFF* tif = TIFFClientOpen(name, mode,
         (thandle_t) &stream,
 TIFF*
 TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
 {
     TIFF* tif = TIFFClientOpen(name, mode,
         (thandle_t) &stream,
-        _tiffReadProc, _tiffWriteProc,
-        _tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
+        _tiffReadProc, _tiffNullProc,
+        _tiffSeekIProc, _tiffCloseProc, _tiffSizeProc,
         _tiffMapProc, _tiffUnmapProc);
 
         _tiffMapProc, _tiffUnmapProc);
 
-    if (tif)
-        tif->tif_fd = (int) &stream;
-       
     return tif;
 }
 
     return tif;
 }
 
+TIFF*
+TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
+{
+    TIFF* tif = TIFFClientOpen(name, mode,
+        (thandle_t) &stream,
+        _tiffNullProc, _tiffWriteProc,
+        _tiffSeekOProc, _tiffCloseProc, _tiffSizeProc,
+        _tiffMapProc, _tiffUnmapProc);
+
+    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();
     image->Destroy();
-    
+
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );
-    
+
     if (!tif)
     {
         if (verbose)
     if (!tif)
     {
         if (verbose)
-            wxLogError( _("Error loading TIFF image.") );
-           
-       return FALSE;
+            wxLogError( _("TIFF: Error loading image.") );
+
+        return false;
     }
     }
-    
+
     if (!TIFFSetDirectory( tif, (tdir_t)index ))
     {
         if (verbose)
             wxLogError( _("Invalid TIFF image index.") );
     if (!TIFFSetDirectory( tif, (tdir_t)index ))
     {
         if (verbose)
             wxLogError( _("Invalid TIFF image index.") );
-           
+
         TIFFClose( tif );
         TIFFClose( tif );
-       
-       return FALSE;
+
+        return false;
     }
 
     uint32 w, h;
     }
 
     uint32 w, h;
-    size_t npixels;
+    uint32 npixels;
     uint32 *raster;
     uint32 *raster;
-    
+
     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
     TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &h );
     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
     TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &h );
-    
+
     npixels = w * h;
     npixels = w * h;
-    
+
     raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
     raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
-    
+
     if (!raster)
     {
         if (verbose)
     if (!raster)
     {
         if (verbose)
-            wxLogError( _("Not enough memory for loading TIFF image.") );
-           
-       return FALSE;
+            wxLogError( _("TIFF: Couldn't allocate memory.") );
+
+        TIFFClose( tif );
+
+        return false;
     }
 
     }
 
-    image->Create( w, h );
-    if (!image->Ok()) 
+    image->Create( (int)w, (int)h );
+    if (!image->Ok())
     {
         if (verbose)
     {
         if (verbose)
-            wxLogError( _("Not enough memory for loading TIFF image.") );
-           
-       _TIFFfree( raster );
-       
-        return FALSE;
+            wxLogError( _("TIFF: Couldn't allocate memory.") );
+
+        _TIFFfree( raster );
+        TIFFClose( tif );
+
+        return false;
     }
     }
-    
+
     if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
     {
         if (verbose)
     if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
     {
         if (verbose)
-            wxLogError( _("Error reading TIFF image.") );
-           
-       _TIFFfree( raster );
-       image->Destroy();
-       
-       return FALSE;
+            wxLogError( _("TIFF: Error reading image.") );
+
+        _TIFFfree( raster );
+        image->Destroy();
+        TIFFClose( tif );
+
+        return false;
     }
     }
-    
-    bool hasmask = FALSE;
-    
+
+    bool hasmask = false;
+
     unsigned char *ptr = image->GetData();
     unsigned char *ptr = image->GetData();
+    ptr += w*3*(h-1);
     uint32 pos = 0;
     uint32 pos = 0;
-    
+
     for (uint32 i = 0; i < h; i++)
     {
     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++;
-       }
+        for (uint32 j = 0; j < w; j++)
+        {
+            unsigned char alpha = (unsigned char)TIFFGetA(raster[pos]);
+            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)TIFFGetR(raster[pos]);
+                ptr++;
+                ptr[0] = (unsigned char)TIFFGetG(raster[pos]);
+                ptr++;
+                ptr[0] = (unsigned char)TIFFGetB(raster[pos]);
+                ptr++;
+            }
+            pos++;
+        }
+        ptr -= 2*w*3; // subtract line we just added plus one line
     }
     }
-    
+
     _TIFFfree( raster );
     _TIFFfree( raster );
-    
+
     TIFFClose( tif );
     TIFFClose( tif );
-       
+
     image->SetMask( hasmask );
     image->SetMask( hasmask );
-    
-    return TRUE;
+
+    return true;
 }
 
 int wxTIFFHandler::GetImageCount( wxInputStream& stream )
 {
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );
 }
 
 int wxTIFFHandler::GetImageCount( wxInputStream& stream )
 {
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );
-    
+
     if (!tif)
     if (!tif)
-       return 0;
+        return 0;
 
     int dircount = 0;  // according to the libtiff docs, dircount should be set to 1 here???
     do {
         dircount++;
     } while (TIFFReadDirectory(tif));
 
     int dircount = 0;  // according to the libtiff docs, dircount should be set to 1 here???
     do {
         dircount++;
     } while (TIFFReadDirectory(tif));
-    
+
     TIFFClose( tif );
     TIFFClose( tif );
-    
+
     return dircount;
 }
 
     return dircount;
 }
 
-bool wxTIFFHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
+bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
 {
 {
-    return FALSE;
-}
+    TIFF *tif = TIFFwxOpen( stream, "image", "w" );
 
 
-bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
-{
-    unsigned char hdr[2];
+    if (!tif)
+    {
+        if (verbose)
+            wxLogError( _("TIFF: Error saving image.") );
 
 
-    stream.Read(&hdr, 2);
-    stream.SeekI(-2, wxFromCurrent);
-    
-    return ((hdr[0] == 0x49 && hdr[1] == 0x49) ||
-            (hdr[0] == 0x4D && hdr[1] == 0x4D));
-}
+        return false;
+    }
 
 
+    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH,  (uint32)image->GetWidth());
+    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32)image->GetHeight());
+    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+    TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
 
 
-#endif
-   // wxUSE_LIBTIFF
+    if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
+            image->HasOption(wxIMAGE_OPTION_RESOLUTIONY) )
+    {
+        TIFFSetField(tif, TIFFTAG_XRESOLUTION,
+                        (float)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX));
+        TIFFSetField(tif, TIFFTAG_YRESOLUTION,
+                        (float)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY));
+    }
+
+    int spp = image->GetOptionInt(wxIMAGE_OPTION_SAMPLESPERPIXEL);
+    if ( !spp )
+        spp = 3;
+
+    int bpp = image->GetOptionInt(wxIMAGE_OPTION_BITSPERSAMPLE);
+    if ( !bpp )
+        bpp=8;
+
+    int compression = image->GetOptionInt(wxIMAGE_OPTION_COMPRESSION);
+    if ( !compression )
+        compression=COMPRESSION_LZW;
+
+    TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp);
+    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bpp);
+    TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, spp*bpp == 1 ? PHOTOMETRIC_MINISBLACK
+                                                        : PHOTOMETRIC_RGB);
+    TIFFSetField(tif, TIFFTAG_COMPRESSION, compression);
+
+    // scanlinesize if determined by spp and bpp
+    tsize_t linebytes = (tsize_t)image->GetWidth() * spp * bpp / 8;
+
+    if ( (image->GetWidth() % 8 > 0) && (spp * bpp < 8) )
+        linebytes+=1;
+
+    unsigned char *buf;
+
+    if (TIFFScanlineSize(tif) > linebytes || (spp * bpp < 24))
+    {
+        buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
+        if (!buf)
+        {
+            if (verbose)
+                wxLogError( _("TIFF: Couldn't allocate memory.") );
+
+            TIFFClose( tif );
+
+            return false;
+        }
+    }
+    else
+    {
+        buf = NULL;
+    }
+
+    TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,TIFFDefaultStripSize(tif, (uint32) -1));
 
 
+    unsigned char *ptr = image->GetData();
+    for ( int row = 0; row < image->GetHeight(); row++ )
+    {
+        if ( buf )
+        {
+            if ( spp * bpp > 1 )
+            {
+                // color image
+                memcpy(buf, ptr, image->GetWidth());
+            }
+            else // black and white image
+            {
+                for ( int column = 0; column < linebytes; column++ )
+                {
+                    uint8 reverse = 0;
+                    for ( int bp = 0; bp < 8; bp++ )
+                    {
+                        if ( ptr[column*24 + bp*3] > 0 )
+                        {
+                            // check only red as this is sufficient
+                            reverse = (uint8)(reverse | 128 >> bp);
+                        }
+                    }
+
+                    buf[column] = reverse;
+                }
+            }
+        }
+
+        if ( TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0 )
+        {
+            if (verbose)
+                wxLogError( _("TIFF: Error writing image.") );
+
+            TIFFClose( tif );
+            if (buf)
+                _TIFFfree(buf);
+
+            return false;
+        }
+
+        ptr += image->GetWidth()*3;
+    }
 
 
+    (void) TIFFClose(tif);
 
 
+    if (buf)
+        _TIFFfree(buf);
 
 
+    return true;
+}
+
+bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[2];
+
+    if ( !stream.Read(&hdr[0], WXSIZEOF(hdr)) )
+        return false;
+
+    return (hdr[0] == 'I' && hdr[1] == 'I') ||
+           (hdr[0] == 'M' && hdr[1] == 'M');
+}
 
 
+#endif  // wxUSE_STREAMS
 
 
+#endif  // wxUSE_LIBTIFF
wxWidgets (Impactor)