X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..df1f4832e5e08438255594172b4c2b31b34f6453:/src/common/imagtiff.cpp diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index ec1a1bc534..3cd681f757 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -7,7 +7,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "imagtiff.h" #endif @@ -20,7 +20,7 @@ #include "wx/defs.h" -#if wxUSE_LIBTIFF +#if wxUSE_IMAGE && wxUSE_LIBTIFF #include "wx/imagtiff.h" #include "wx/bitmap.h" @@ -37,21 +37,30 @@ extern "C" #include "wx/intl.h" #include "wx/module.h" +#ifndef TIFFLINKAGEMODE + #define TIFFLINKAGEMODE LINKAGEMODE +#endif + //----------------------------------------------------------------------------- // wxTIFFHandler //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler) -static tsize_t +#if wxUSE_STREAMS + +extern "C" +{ + +tsize_t TIFFLINKAGEMODE _tiffNullProc(thandle_t WXUNUSED(handle), - tdata_t WXUNUSED(buf), - tsize_t WXUNUSED(size)) + tdata_t WXUNUSED(buf), + tsize_t WXUNUSED(size)) { return (tsize_t) -1; } -static tsize_t +tsize_t TIFFLINKAGEMODE _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size) { wxInputStream *stream = (wxInputStream*) handle; @@ -59,7 +68,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size) return stream->LastRead(); } -static tsize_t +tsize_t TIFFLINKAGEMODE _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size) { wxOutputStream *stream = (wxOutputStream*) handle; @@ -67,7 +76,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size) return stream->LastWrite(); } -static toff_t +toff_t TIFFLINKAGEMODE _tiffSeekIProc(thandle_t handle, toff_t off, int whence) { wxInputStream *stream = (wxInputStream*) handle; @@ -80,10 +89,10 @@ _tiffSeekIProc(thandle_t handle, toff_t off, int whence) default: mode = wxFromCurrent; break; } - return (toff_t)stream->SeekI( (off_t)off, mode ); + return (toff_t)stream->SeekI( (wxFileOffset)off, mode ); } -static toff_t +toff_t TIFFLINKAGEMODE _tiffSeekOProc(thandle_t handle, toff_t off, int whence) { wxOutputStream *stream = (wxOutputStream*) handle; @@ -96,23 +105,23 @@ _tiffSeekOProc(thandle_t handle, toff_t off, int whence) default: mode = wxFromCurrent; break; } - return (toff_t)stream->SeekO( (off_t)off, mode ); + return (toff_t)stream->SeekO( (wxFileOffset)off, mode ); } -static int +int TIFFLINKAGEMODE _tiffCloseProc(thandle_t WXUNUSED(handle)) { return 0; // ? } -static toff_t +toff_t TIFFLINKAGEMODE _tiffSizeProc(thandle_t handle) { wxStreamBase *stream = (wxStreamBase*) handle; return (toff_t) stream->GetSize(); } -static int +int TIFFLINKAGEMODE _tiffMapProc(thandle_t WXUNUSED(handle), tdata_t* WXUNUSED(pbase), toff_t* WXUNUSED(psize)) @@ -120,13 +129,31 @@ _tiffMapProc(thandle_t WXUNUSED(handle), return 0; } -static void +void TIFFLINKAGEMODE _tiffUnmapProc(thandle_t WXUNUSED(handle), tdata_t WXUNUSED(base), toff_t WXUNUSED(size)) { } +static void +TIFFwxWarningHandler(const char* module, const char* fmt, va_list ap) +{ + if (module != NULL) + wxLogWarning(_("tiff module: %s"), module); + wxLogWarning((wxChar *) fmt, ap); +} + +static void +TIFFwxErrorHandler(const char* module, const char* fmt, va_list ap) +{ + if (module != NULL) + wxLogError(_("tiff module: %s"), module); + wxVLogError((wxChar *) fmt, ap); +} + +} // extern "C" + TIFF* TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode) { @@ -151,8 +178,21 @@ TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode) return tif; } +wxTIFFHandler::wxTIFFHandler() +{ + m_name = wxT("TIFF file"); + m_extension = wxT("tif"); + m_type = wxBITMAP_TYPE_TIF; + m_mime = wxT("image/tiff"); + TIFFSetWarningHandler((TIFFErrorHandler) TIFFwxWarningHandler); + TIFFSetErrorHandler((TIFFErrorHandler) TIFFwxErrorHandler); +} + bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index ) { + if (index == -1) + index = 0; + image->Destroy(); TIFF *tif = TIFFwxOpen( stream, "image", "r" ); @@ -162,7 +202,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos if (verbose) wxLogError( _("TIFF: Error loading image.") ); - return FALSE; + return false; } if (!TIFFSetDirectory( tif, (tdir_t)index )) @@ -172,7 +212,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos TIFFClose( tif ); - return FALSE; + return false; } uint32 w, h; @@ -190,10 +230,10 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos { if (verbose) wxLogError( _("TIFF: Couldn't allocate memory.") ); - + TIFFClose( tif ); - return FALSE; + return false; } image->Create( (int)w, (int)h ); @@ -205,7 +245,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos _TIFFfree( raster ); TIFFClose( tif ); - return FALSE; + return false; } if (!TIFFReadRGBAImage( tif, w, h, raster, 0 )) @@ -217,10 +257,10 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos image->Destroy(); TIFFClose( tif ); - return FALSE; + return false; } - bool hasmask = FALSE; + bool hasmask = false; unsigned char *ptr = image->GetData(); ptr += w*3*(h-1); @@ -233,7 +273,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos unsigned char alpha = (unsigned char)TIFFGetA(raster[pos]); if (alpha < 127) { - hasmask = TRUE; + hasmask = true; ptr[0] = image->GetMaskRed(); ptr++; ptr[0] = image->GetMaskGreen(); @@ -261,7 +301,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos image->SetMask( hasmask ); - return TRUE; + return true; } int wxTIFFHandler::GetImageCount( wxInputStream& stream ) @@ -290,7 +330,7 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo if (verbose) wxLogError( _("TIFF: Error saving image.") ); - return FALSE; + return false; } TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32)image->GetWidth()); @@ -301,11 +341,11 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo 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) + + if (TIFFScanlineSize(tif) > linebytes) { buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif)); if (!buf) @@ -315,33 +355,33 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo TIFFClose( tif ); - return FALSE; + return false; } - } - else + } + else { buf = NULL; } TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, TIFFDefaultStripSize(tif, (uint32) -1)); - + unsigned char *ptr = image->GetData(); - for (int row = 0; row < image->GetHeight(); row++) + 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 (buf) + memcpy(buf, ptr, image->GetWidth()); + + if (TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0) { - if (verbose) - wxLogError( _("TIFF: Error writing image.") ); - + if (verbose) + wxLogError( _("TIFF: Error writing image.") ); + TIFFClose( tif ); if (buf) _TIFFfree(buf); - - return FALSE; + + return false; } ptr += image->GetWidth()*3; } @@ -351,22 +391,21 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo if (buf) _TIFFfree(buf); - return TRUE; + return true; } bool wxTIFFHandler::DoCanRead( wxInputStream& stream ) { unsigned char hdr[2]; - stream.Read(&hdr, 2); - stream.SeekI(-2, wxFromCurrent); + if ( !stream.Read(&hdr[0], 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