/////////////////////////////////////////////////////////////////////////////
-// 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$
-// 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
-*/
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#include "wx/defs.h"
+#if wxUSE_IMAGE && wxUSE_LIBTIFF
+
+#include "wx/imagtiff.h"
+#include "wx/versioninfo.h"
-#if wxUSE_LIBTIFF
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/intl.h"
+ #include "wx/bitmap.h"
+ #include "wx/module.h"
+ #include "wx/wxcrtvararg.h"
+#endif
-#include "wx/image.h"
-#include "wx/bitmap.h"
-#include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/app.h"
extern "C"
{
+#ifdef __DMC__
+ #include "tif_config.h"
+#endif
#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"
+
+#ifndef TIFFLINKAGEMODE
+ #if defined(__WATCOMC__) && defined(__WXMGL__)
+ #define TIFFLINKAGEMODE cdecl
+ #else
+ #define TIFFLINKAGEMODE LINKAGEMODE
+ #endif
+#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// TIFF library error/warning handlers
+// ----------------------------------------------------------------------------
+
+static wxString
+FormatTiffMessage(const char *module, const char *fmt, va_list ap)
+{
+ char buf[512];
+ if ( wxCRT_VsnprintfA(buf, WXSIZEOF(buf), fmt, ap) <= 0 )
+ {
+ // this isn't supposed to happen, but if it does, it's better
+ // than nothing
+ strcpy(buf, "Incorrectly formatted TIFF message");
+ }
+ buf[WXSIZEOF(buf)-1] = 0; // make sure it is always NULL-terminated
+
+ wxString msg(buf);
+ if ( module )
+ msg += wxString::Format(_(" (in module \"%s\")"), module);
+
+ return msg;
+}
+
+extern "C"
+{
+
+static void
+TIFFwxWarningHandler(const char* module, const char *fmt, va_list ap)
+{
+ wxLogWarning("%s", FormatTiffMessage(module, fmt, ap));
+}
+
+static void
+TIFFwxErrorHandler(const char* module, const char *fmt, va_list ap)
+{
+ wxLogError("%s", FormatTiffMessage(module, fmt, ap));
+}
+
+} // 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)
+wxTIFFHandler::wxTIFFHandler()
+{
+ m_name = wxT("TIFF file");
+ m_extension = wxT("tif");
+ m_altExtensions.Add(wxT("tiff"));
+ m_type = wxBITMAP_TYPE_TIF;
+ m_mime = wxT("image/tiff");
+ TIFFSetWarningHandler((TIFFErrorHandler) TIFFwxWarningHandler);
+ TIFFSetErrorHandler((TIFFErrorHandler) TIFFwxErrorHandler);
+}
+
+#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,
+ wxT("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
+wxTIFFNullProc(thandle_t WXUNUSED(handle),
+ tdata_t WXUNUSED(buf),
+ tsize_t WXUNUSED(size))
+{
+ return (tsize_t) -1;
+}
+
+tsize_t TIFFLINKAGEMODE
+wxTIFFReadProc(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
-_tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
+tsize_t TIFFLINKAGEMODE
+wxTIFFWriteProc(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
+wxTIFFSeekIProc(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 );
+
+ return wxFileOffsetToTIFF(stream->SeekI((wxFileOffset)off,
+ wxSeekModeFromTIFF(whence)));
}
-static int
-_tiffCloseProc(thandle_t WXUNUSED(handle))
+toff_t TIFFLINKAGEMODE
+wxTIFFSeekOProc(thandle_t handle, toff_t off, int whence)
{
- return 0; // ?
+ wxOutputStream *stream = (wxOutputStream*) handle;
+
+ return wxFileOffsetToTIFF(stream->SeekO((wxFileOffset)off,
+ wxSeekModeFromTIFF(whence)));
}
-static toff_t
-_tiffSizeProc(thandle_t handle)
+int TIFFLINKAGEMODE
+wxTIFFCloseIProc(thandle_t WXUNUSED(handle))
{
- wxInputStream *stream = (wxInputStream*) handle;
+ // there is no need to close the input stream
+ return 0;
+}
+
+int TIFFLINKAGEMODE
+wxTIFFCloseOProc(thandle_t handle)
+{
+ wxOutputStream *stream = (wxOutputStream*) handle;
+
+ return stream->Close() ? 0 : -1;
+}
+
+toff_t TIFFLINKAGEMODE
+wxTIFFSizeProc(thandle_t handle)
+{
+ wxStreamBase *stream = (wxStreamBase*) handle;
return (toff_t) stream->GetSize();
}
-static int
-_tiffMapProc(thandle_t WXUNUSED(handle), tdata_t* pbase, toff_t* psize)
+int TIFFLINKAGEMODE
+wxTIFFMapProc(thandle_t WXUNUSED(handle),
+ tdata_t* WXUNUSED(pbase),
+ toff_t* WXUNUSED(psize))
{
return 0;
}
-static void
-_tiffUnmapProc(thandle_t WXUNUSED(handle), tdata_t base, toff_t size)
+void TIFFLINKAGEMODE
+wxTIFFUnmapProc(thandle_t WXUNUSED(handle),
+ tdata_t WXUNUSED(base),
+ toff_t WXUNUSED(size))
{
}
+} // extern "C"
+
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);
+ wxTIFFReadProc, wxTIFFNullProc,
+ wxTIFFSeekIProc, wxTIFFCloseIProc, wxTIFFSizeProc,
+ wxTIFFMapProc, wxTIFFUnmapProc);
- 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,
+ wxTIFFNullProc, wxTIFFWriteProc,
+ wxTIFFSeekOProc, wxTIFFCloseOProc, wxTIFFSizeProc,
+ wxTIFFMapProc, wxTIFFUnmapProc);
+
+ return tif;
+}
-bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
+bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
{
+ if (index == -1)
+ index = 0;
+
image->Destroy();
-
+
TIFF *tif = TIFFwxOpen( stream, "image", "r" );
-
+
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.") );
+ }
+
+ TIFFClose( tif );
+
+ 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) );
-
+
+ uint16 photometric;
+ uint16 samplesPerPixel;
+ uint16 extraSamples;
+ uint16* samplesInfo;
+ TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &samplesPerPixel);
+ TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
+ &extraSamples, &samplesInfo);
+ if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric))
+ {
+ photometric = PHOTOMETRIC_MINISWHITE;
+ }
+ const bool hasAlpha = (extraSamples >= 1
+ && ((samplesInfo[0] == EXTRASAMPLE_UNSPECIFIED && samplesPerPixel > 3)
+ || samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA
+ || samplesInfo[0] == EXTRASAMPLE_UNASSALPHA))
+ || (extraSamples == 0 && samplesPerPixel == 4
+ && photometric == PHOTOMETRIC_RGB);
+
+ // guard against integer overflow during multiplication which could result
+ // in allocating a too small buffer and then overflowing it
+ const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
+ if ( bytesNeeded >= wxUINT32_MAX )
+ {
+ if ( verbose )
+ {
+ wxLogError( _("TIFF: Image size is abnormally big.") );
+ }
+
+ TIFFClose(tif);
+
+ return false;
+ }
+
+ raster = (uint32*) _TIFFmalloc( (uint32)bytesNeeded );
+
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->IsOk())
{
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 ( hasAlpha )
+ image->SetAlpha();
+
if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
{
if (verbose)
- wxLogError( _("Error reading TIFF image.") );
-
- _TIFFfree( raster );
- image->Destroy();
-
- return FALSE;
- }
-
- bool hasmask = FALSE;
-
+ {
+ wxLogError( _("TIFF: Error reading image.") );
+ }
+
+ _TIFFfree( raster );
+ image->Destroy();
+ TIFFClose( tif );
+
+ return false;
+ }
+
unsigned char *ptr = image->GetData();
+ ptr += w*3*(h-1);
+
+ unsigned char *alpha = hasAlpha ? image->GetAlpha() : NULL;
+ if ( hasAlpha )
+ alpha += w*(h-1);
+
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++;
- }
- }
-
+ for (uint32 j = 0; j < w; j++)
+ {
+ *(ptr++) = (unsigned char)TIFFGetR(raster[pos]);
+ *(ptr++) = (unsigned char)TIFFGetG(raster[pos]);
+ *(ptr++) = (unsigned char)TIFFGetB(raster[pos]);
+ if ( hasAlpha )
+ *(alpha++) = (unsigned char)TIFFGetA(raster[pos]);
+
+ pos++;
+ }
+
+ // subtract line we just added plus one line:
+ ptr -= 2*w*3;
+ if ( hasAlpha )
+ alpha -= 2*w;
+ }
+
+
+ uint16 spp, bpp, compression;
+ /*
+ Read some baseline TIFF tags which helps when re-saving a TIFF
+ to be similar to the original image.
+ */
+ if ( TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &spp) )
+ {
+ image->SetOption(wxIMAGE_OPTION_SAMPLESPERPIXEL, spp);
+ }
+
+ if ( TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bpp) )
+ {
+ image->SetOption(wxIMAGE_OPTION_BITSPERSAMPLE, bpp);
+ }
+
+ if ( TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compression) )
+ {
+ image->SetOption(wxIMAGE_OPTION_COMPRESSION, compression);
+ }
+
+ // Set the resolution unit.
+ wxImageResolution resUnit = wxIMAGE_RESOLUTION_NONE;
+ uint16 tiffRes;
+ if ( TIFFGetFieldDefaulted(tif, TIFFTAG_RESOLUTIONUNIT, &tiffRes) )
+ {
+ switch (tiffRes)
+ {
+ default:
+ wxLogWarning(_("Unknown TIFF resolution unit %d ignored"),
+ tiffRes);
+ // fall through
+
+ case RESUNIT_NONE:
+ resUnit = wxIMAGE_RESOLUTION_NONE;
+ break;
+
+ case RESUNIT_INCH:
+ resUnit = wxIMAGE_RESOLUTION_INCHES;
+ break;
+
+ case RESUNIT_CENTIMETER:
+ resUnit = wxIMAGE_RESOLUTION_CM;
+ break;
+ }
+ }
+
+ image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, resUnit);
+
+ /*
+ Set the image resolution if it's available. Resolution tag is not
+ dependant on RESOLUTIONUNIT != RESUNIT_NONE (according to TIFF spec).
+ */
+ float resX, resY;
+
+ if ( TIFFGetField(tif, TIFFTAG_XRESOLUTION, &resX) )
+ {
+ /*
+ Use a string value to not lose precision.
+ rounding to int as cm and then converting to inch may
+ result in whole integer rounding error, eg. 201 instead of 200 dpi.
+ If an app wants an int, GetOptionInt will convert and round down.
+ */
+ image->SetOption(wxIMAGE_OPTION_RESOLUTIONX,
+ wxString::FromCDouble((double) resX));
+ }
+
+ if ( TIFFGetField(tif, TIFFTAG_YRESOLUTION, &resY) )
+ {
+ image->SetOption(wxIMAGE_OPTION_RESOLUTIONY,
+ wxString::FromCDouble((double) resY));
+ }
+
_TIFFfree( raster );
-
+
TIFFClose( tif );
-
- image->SetMask( hasmask );
-
- return TRUE;
+
+ return true;
}
+int wxTIFFHandler::DoGetImageCount( 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 );
+
+ // NOTE: this function modifies the current stream position but it's ok
+ // (see wxImageHandler::GetImageCount)
+
+ return dircount;
+}
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_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);
+
+ // save the image resolution if we have it
+ int xres, yres;
+ const wxImageResolution res = GetResolutionFromOptions(*image, &xres, &yres);
+ uint16 tiffRes;
+ switch ( res )
+ {
+ default:
+ wxFAIL_MSG( wxT("unknown image resolution units") );
+ // fall through
+
+ case wxIMAGE_RESOLUTION_NONE:
+ tiffRes = RESUNIT_NONE;
+ break;
+
+ case wxIMAGE_RESOLUTION_INCHES:
+ tiffRes = RESUNIT_INCH;
+ break;
+
+ case wxIMAGE_RESOLUTION_CM:
+ tiffRes = RESUNIT_CENTIMETER;
+ break;
+ }
+
+ if ( tiffRes != RESUNIT_NONE )
+ {
+ TIFFSetField(tif, TIFFTAG_RESOLUTIONUNIT, tiffRes);
+ TIFFSetField(tif, TIFFTAG_XRESOLUTION, (float)xres);
+ TIFFSetField(tif, TIFFTAG_YRESOLUTION, (float)yres);
+ }
+
+
+ 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 )
+ {
+ // we can't use COMPRESSION_LZW because current version of libtiff
+ // doesn't implement it ("no longer implemented due to Unisys patent
+ // enforcement") and other compression methods are lossy so we
+ // shouldn't use them by default -- and the only remaining one is none
+ compression = COMPRESSION_NONE;
+ }
+
+ 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];
- stream.Read(&hdr, 2);
- stream.SeekI(-2, wxFromCurrent);
-
- return ((hdr[0] == 0x49 && hdr[1] == 0x49) ||
- (hdr[0] == 0x4D && hdr[1] == 0x4D));
+ if ( !stream.Read(&hdr[0], WXSIZEOF(hdr)) ) // it's ok to modify the stream position here
+ return false;
+
+ return (hdr[0] == 'I' && hdr[1] == 'I') ||
+ (hdr[0] == 'M' && hdr[1] == 'M');
}
+#endif // wxUSE_STREAMS
-#endif
- // wxUSE_LIBTIFF
-
+/*static*/ wxVersionInfo wxTIFFHandler::GetLibraryVersionInfo()
+{
+ int major,
+ minor,
+ micro;
+ const wxString ver(::TIFFGetVersion());
+ if ( wxSscanf(ver, "LIBTIFF, Version %d.%d.%d", &major, &minor, µ) != 3 )
+ {
+ wxLogDebug("Unrecognized libtiff version string \"%s\"", ver);
+ major =
+ minor =
+ micro = 0;
+ }
+ wxString copyright;
+ const wxString desc = ver.BeforeFirst('\n', ©right);
+ copyright.Replace("\n", "");
+ return wxVersionInfo("libtiff", major, minor, micro, desc, copyright);
+}
+#endif // wxUSE_LIBTIFF
projects / wxWidgets.git / blobdiff