X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60d43ad883f16c458928fa7e4e1dbb96f492e77a..642067e02a202feddc97255f1229e4e7378541d9:/src/common/imagtiff.cpp?ds=sidebyside diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index cf49f4aa82..741bc36472 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -47,7 +47,12 @@ extern "C" IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler) -static tsize_t TIFFLINKAGEMODE +#if wxUSE_STREAMS + +extern "C" +{ + +tsize_t TIFFLINKAGEMODE _tiffNullProc(thandle_t WXUNUSED(handle), tdata_t WXUNUSED(buf), tsize_t WXUNUSED(size)) @@ -55,7 +60,7 @@ _tiffNullProc(thandle_t WXUNUSED(handle), return (tsize_t) -1; } -static tsize_t TIFFLINKAGEMODE +tsize_t TIFFLINKAGEMODE _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size) { wxInputStream *stream = (wxInputStream*) handle; @@ -63,7 +68,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size) return stream->LastRead(); } -static tsize_t TIFFLINKAGEMODE +tsize_t TIFFLINKAGEMODE _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size) { wxOutputStream *stream = (wxOutputStream*) handle; @@ -71,7 +76,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size) return stream->LastWrite(); } -static toff_t TIFFLINKAGEMODE +toff_t TIFFLINKAGEMODE _tiffSeekIProc(thandle_t handle, toff_t off, int whence) { wxInputStream *stream = (wxInputStream*) handle; @@ -87,7 +92,7 @@ _tiffSeekIProc(thandle_t handle, toff_t off, int whence) return (toff_t)stream->SeekI( (off_t)off, mode ); } -static toff_t TIFFLINKAGEMODE +toff_t TIFFLINKAGEMODE _tiffSeekOProc(thandle_t handle, toff_t off, int whence) { wxOutputStream *stream = (wxOutputStream*) handle; @@ -103,20 +108,20 @@ _tiffSeekOProc(thandle_t handle, toff_t off, int whence) return (toff_t)stream->SeekO( (off_t)off, mode ); } -static int TIFFLINKAGEMODE +int TIFFLINKAGEMODE _tiffCloseProc(thandle_t WXUNUSED(handle)) { return 0; // ? } -static toff_t TIFFLINKAGEMODE +toff_t TIFFLINKAGEMODE _tiffSizeProc(thandle_t handle) { wxStreamBase *stream = (wxStreamBase*) handle; return (toff_t) stream->GetSize(); } -static int TIFFLINKAGEMODE +int TIFFLINKAGEMODE _tiffMapProc(thandle_t WXUNUSED(handle), tdata_t* WXUNUSED(pbase), toff_t* WXUNUSED(psize)) @@ -124,13 +129,15 @@ _tiffMapProc(thandle_t WXUNUSED(handle), return 0; } -static void TIFFLINKAGEMODE +void TIFFLINKAGEMODE _tiffUnmapProc(thandle_t WXUNUSED(handle), tdata_t WXUNUSED(base), toff_t WXUNUSED(size)) { } +} // extern "C" + TIFF* TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode) { @@ -271,7 +278,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos return TRUE; } -int wxTIFFHandler::GetImagesCount( wxInputStream& stream ) +int wxTIFFHandler::GetImageCount( wxInputStream& stream ) { TIFF *tif = TIFFwxOpen( stream, "image", "r" ); @@ -365,15 +372,14 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream ) { unsigned char hdr[2]; - stream.Read(&hdr, 2); - stream.SeekI(-2, wxFromCurrent); + if ( !stream.Read(&hdr, WXSIZEOF(hdr)) ) + return FALSE; - return ((hdr[0] == 0x49 && hdr[1] == 0x49) || - (hdr[0] == 0x4D && hdr[1] == 0x4D)); + return (hdr[0] == 'I' && hdr[1] == 'I') || + (hdr[0] == 'M' && hdr[1] == 'M'); } +#endif // wxUSE_STREAMS -#endif - // wxUSE_LIBTIFF - +#endif // wxUSE_LIBTIFF