#include "wx/defs.h"
-#if wxUSE_LIBTIFF
+#if wxUSE_IMAGE && wxUSE_LIBTIFF
#include "wx/imagtiff.h"
#include "wx/bitmap.h"
{
#include "tiff.h"
#include "tiffio.h"
- #include "tiffiop.h"
}
#include "wx/filefn.h"
#include "wx/wfstream.h"
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;
return stream->LastRead();
}
-static tsize_t
+static tsize_t LINKAGEMODE
_tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
{
wxOutputStream *stream = (wxOutputStream*) handle;
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;
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; // ?
}
-static toff_t
+static toff_t LINKAGEMODE
_tiffSizeProc(thandle_t handle)
{
- wxInputStream *stream = (wxInputStream*) handle;
+ wxStreamBase *stream = (wxStreamBase*) handle;
return (toff_t) stream->GetSize();
}
-static int
+static int LINKAGEMODE
_tiffMapProc(thandle_t WXUNUSED(handle),
tdata_t* WXUNUSED(pbase),
toff_t* WXUNUSED(psize))
return 0;
}
-static void
+static void LINKAGEMODE
_tiffUnmapProc(thandle_t WXUNUSED(handle),
tdata_t WXUNUSED(base),
toff_t WXUNUSED(size))
{
TIFF* tif = TIFFClientOpen(name, mode,
(thandle_t) &stream,
- _tiffReadProc, _tiffWriteProc,
- _tiffSeekProc, _tiffCloseProc, _tiffSizeProc,
+ _tiffReadProc, _tiffNullProc,
+ _tiffSeekIProc, _tiffCloseProc, _tiffSizeProc,
_tiffMapProc, _tiffUnmapProc);
- if (tif)
- tif->tif_fd = (int) &stream;
-
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 )
{
if (verbose)
wxLogError( _("TIFF: Couldn't allocate memory.") );
+ TIFFClose( tif );
+
return FALSE;
}
wxLogError( _("TIFF: Couldn't allocate memory.") );
_TIFFfree( raster );
+ TIFFClose( tif );
return FALSE;
}
_TIFFfree( raster );
image->Destroy();
+ TIFFClose( tif );
return FALSE;
}
bool hasmask = FALSE;
unsigned char *ptr = image->GetData();
+ ptr += w*3*(h-1);
uint32 pos = 0;
for (uint32 i = 0; i < h; i++)
{
- for (uint32 j = 0; w < h; j++)
+ for (uint32 j = 0; j < w; j++)
{
- unsigned char alpha = (unsigned char)(raster[pos] >> 24);
+ unsigned char alpha = (unsigned char)TIFFGetA(raster[pos]);
if (alpha < 127)
{
hasmask = TRUE;
}
else
{
- ptr[0] = (unsigned char)(raster[pos] >> 16);
+ ptr[0] = (unsigned char)TIFFGetR(raster[pos]);
ptr++;
- ptr[0] = (unsigned char)(raster[pos] >> 8);
+ ptr[0] = (unsigned char)TIFFGetG(raster[pos]);
ptr++;
- ptr[0] = (unsigned char)(raster[pos]);
+ ptr[0] = (unsigned char)TIFFGetB(raster[pos]);
ptr++;
}
pos++;
}
+ ptr -= 2*w*3; // subtract line we just added plus one line
}
_TIFFfree( raster );
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 )
// wxUSE_LIBTIFF
-
-
-
-
projects / wxWidgets.git / blobdiff