applied patch 432814: saving BMP in 1, 4 and 8 bpp

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

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 881870a0ce00dcad27725b6ae45a2b8116ab15f0..c030a83c848aff8fcb90219b68aaa49b0b75de23 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_LIBTIFF
+#if wxUSE_IMAGE && wxUSE_LIBTIFF

 
 #include "wx/imagtiff.h"
 #include "wx/bitmap.h"
 
 #include "wx/imagtiff.h"
 #include "wx/bitmap.h"


@@ -31,7 +31,6 @@ 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/filefn.h"
 #include "wx/wfstream.h"


@@ -44,7 +43,15 @@ extern "C"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 

-static tsize_t
+static tsize_t LINKAGEMODE
+_tiffNullProc(thandle_t WXUNUSED(handle),
+             tdata_t WXUNUSED(buf),
+             tsize_t WXUNUSED(size))
+{
+    return (tsize_t) -1;
+}
+
+static tsize_t LINKAGEMODE

 _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;


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

-static tsize_t
+static tsize_t LINKAGEMODE

 _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;


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

-static toff_t
-_tiffSeekProc(thandle_t handle, toff_t off, int whence)
+static toff_t LINKAGEMODE
+_tiffSeekIProc(thandle_t handle, toff_t off, int whence)

 {
     wxInputStream *stream = (wxInputStream*) handle;
     wxSeekMode mode;
 {
     wxInputStream *stream = (wxInputStream*) handle;
     wxSeekMode mode;


@@ -72,31 +79,51 @@ _tiffSeekProc(thandle_t handle, toff_t off, int whence)
         case SEEK_END: mode = wxFromEnd; break;
         default:       mode = wxFromCurrent; break;
     }
         case SEEK_END: mode = wxFromEnd; break;
         default:       mode = wxFromCurrent; break;
     }

-    
+

     return (toff_t)stream->SeekI( (off_t)off, mode );
 }
 
     return (toff_t)stream->SeekI( (off_t)off, mode );
 }
 

-static int
+static toff_t LINKAGEMODE
+_tiffSeekOProc(thandle_t handle, toff_t off, int whence)
+{
+    wxOutputStream *stream = (wxOutputStream*) 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->SeekO( (off_t)off, mode );
+}
+
+static int LINKAGEMODE

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

-static toff_t
+static toff_t LINKAGEMODE

 _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)
+static int LINKAGEMODE
+_tiffMapProc(thandle_t WXUNUSED(handle),
+             tdata_t* WXUNUSED(pbase),
+             toff_t* WXUNUSED(psize))

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-static void
-_tiffUnmapProc(thandle_t WXUNUSED(handle), tdata_t base, toff_t size)
+static void LINKAGEMODE
+_tiffUnmapProc(thandle_t WXUNUSED(handle),
+               tdata_t WXUNUSED(base),
+               toff_t WXUNUSED(size))

 {
 }
 
 {
 }
 


@@ -105,144 +132,226 @@ TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
 {
     TIFF* tif = TIFFClientOpen(name, mode,
         (thandle_t) &stream,
 {
     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;
+}

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

-    
+

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

-    
+

     if (!tif)
     {
         if (verbose)
             wxLogError( _("TIFF: Error loading image.") );
     if (!tif)
     {
         if (verbose)
             wxLogError( _("TIFF: Error loading image.") );

-           
-       return FALSE;
+
+        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)
             wxLogError( _("TIFF: Couldn't allocate memory.") );
     if (!raster)
     {
         if (verbose)
             wxLogError( _("TIFF: Couldn't allocate memory.") );

-           
-       return FALSE;
+
+        TIFFClose( tif );
+
+        return FALSE;

     }
 
     }
 

-    image->Create( w, h );
-    if (!image->Ok()) 
+    image->Create( (int)w, (int)h );
+    if (!image->Ok())

     {
         if (verbose)
             wxLogError( _("TIFF: Couldn't allocate memory.") );
     {
         if (verbose)
             wxLogError( _("TIFF: Couldn't allocate memory.") );

-           
-       _TIFFfree( raster );
-       
+
+        _TIFFfree( raster );
+        TIFFClose( tif );
+

         return FALSE;
     }
         return FALSE;
     }

-    
+

     if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
     {
         if (verbose)
             wxLogError( _("TIFF: Error reading image.") );
     if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
     {
         if (verbose)
             wxLogError( _("TIFF: Error reading image.") );

-           
-       _TIFFfree( raster );
-       image->Destroy();
-       
-       return FALSE;
+
+        _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;
 }
 
 int wxTIFFHandler::GetImageCount( wxInputStream& stream )
 {
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );
     return TRUE;
 }
 
 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" );
+
+    if (!tif)
+    {
+        if (verbose)
+            wxLogError( _("TIFF: Error saving image.") );
+
+        return FALSE;
+    }
+
+    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH,  (uint32)image->GetWidth());
+    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32)image->GetHeight());
+    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+    TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3);
+    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
+    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;
+
+    if (TIFFScanlineSize(tif) > linebytes)
+    {
+        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)
+               memcpy(buf, ptr, image->GetWidth());
+
+           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 )
 }
 
 bool wxTIFFHandler::DoCanRead( wxInputStream& stream )


@@ -251,7 +360,7 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
 
     stream.Read(&hdr, 2);
     stream.SeekI(-2, wxFromCurrent);
 
     stream.Read(&hdr, 2);
     stream.SeekI(-2, wxFromCurrent);

-    
+

     return ((hdr[0] == 0x49 && hdr[1] == 0x49) ||
             (hdr[0] == 0x4D && hdr[1] == 0x4D));
 }
     return ((hdr[0] == 0x49 && hdr[1] == 0x49) ||
             (hdr[0] == 0x4D && hdr[1] == 0x4D));
 }


@@ -261,7 +370,3 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
    // wxUSE_LIBTIFF
 
 
    // wxUSE_LIBTIFF
 
 

-
-
-
-