X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/257bcf288a835c63da690e0d150bb4d4849f9863..270a909e20a2c652fd816ad14407113ad0319c9d:/src/common/imagtiff.cpp diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index 474e12e3e0..b182648068 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -52,8 +52,7 @@ _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; + return stream->LastRead(); } static tsize_t @@ -61,8 +60,7 @@ _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; + return stream->LastWrite(); } static toff_t @@ -91,8 +89,7 @@ static toff_t _tiffSizeProc(thandle_t handle) { wxInputStream *stream = (wxInputStream*) handle; - long fsize; - return ((fsize = stream->SeekI(0, wxFromEnd)) < 0 ? 0 : fsize); + return (toff_t) stream->GetSize(); } static int @@ -122,11 +119,11 @@ TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode) } -bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose ) +bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index ) { image->Destroy(); - TIFF *tif = TIFFwxOpen( stream, "horse.tif", "r" ); + TIFF *tif = TIFFwxOpen( stream, "image", "r" ); if (!tif) { @@ -135,6 +132,16 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos 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; @@ -219,24 +226,37 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos return TRUE; } +int wxTIFFHandler::GetImageCount( 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 ); + + return dircount; +} -bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) +bool wxTIFFHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) ) { return FALSE; } bool wxTIFFHandler::DoCanRead( wxInputStream& stream ) { - return TRUE; + unsigned char hdr[2]; -/* - 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'); -*/ + stream.Read(&hdr, 2); + stream.SeekI(-2, wxFromCurrent); + + return ((hdr[0] == 0x49 && hdr[1] == 0x49) || + (hdr[0] == 0x4D && hdr[1] == 0x4D)); }