X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/963ad140d0bc0a86df7cab700076a8d6192fc64c..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/imagtiff.cpp diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index 5fab2afced..6a2d5b445a 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagtiff.cpp +// Name: src/common/imagtiff.cpp // Purpose: wxImage TIFF handler // Author: Robert Roebling // RCS-ID: $Id$ @@ -7,26 +7,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "imagtiff.h" -#endif - // 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/bitmap.h" -#include "wx/debug.h" -#include "wx/log.h" -#include "wx/app.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/intl.h" + #include "wx/bitmap.h" + #include "wx/module.h" +#endif + extern "C" { #include "tiff.h" @@ -34,11 +33,13 @@ extern "C" } #include "wx/filefn.h" #include "wx/wfstream.h" -#include "wx/intl.h" -#include "wx/module.h" #ifndef TIFFLINKAGEMODE - #define TIFFLINKAGEMODE LINKAGEMODE + #if defined(__WATCOMC__) && defined(__WXMGL__) + #define TIFFLINKAGEMODE cdecl + #else + #define TIFFLINKAGEMODE LINKAGEMODE + #endif #endif //----------------------------------------------------------------------------- @@ -49,11 +50,44 @@ IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler) #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, + _T("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 -_tiffNullProc(thandle_t WXUNUSED(handle), +wxTIFFNullProc(thandle_t WXUNUSED(handle), tdata_t WXUNUSED(buf), tsize_t WXUNUSED(size)) { @@ -61,68 +95,63 @@ _tiffNullProc(thandle_t WXUNUSED(handle), } tsize_t TIFFLINKAGEMODE -_tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size) +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()); } tsize_t TIFFLINKAGEMODE -_tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size) +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()); } toff_t TIFFLINKAGEMODE -_tiffSeekIProc(thandle_t handle, toff_t off, int whence) +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( (wxFileOffset)off, mode ); + return wxFileOffsetToTIFF(stream->SeekI((wxFileOffset)off, + wxSeekModeFromTIFF(whence))); } toff_t TIFFLINKAGEMODE -_tiffSeekOProc(thandle_t handle, toff_t off, int whence) +wxTIFFSeekOProc(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( (wxFileOffset)off, mode ); + return wxFileOffsetToTIFF(stream->SeekO((wxFileOffset)off, + wxSeekModeFromTIFF(whence))); } int TIFFLINKAGEMODE -_tiffCloseProc(thandle_t WXUNUSED(handle)) +wxTIFFCloseIProc(thandle_t WXUNUSED(handle)) { - return 0; // ? + // 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 -_tiffSizeProc(thandle_t handle) +wxTIFFSizeProc(thandle_t handle) { wxStreamBase *stream = (wxStreamBase*) handle; return (toff_t) stream->GetSize(); } int TIFFLINKAGEMODE -_tiffMapProc(thandle_t WXUNUSED(handle), +wxTIFFMapProc(thandle_t WXUNUSED(handle), tdata_t* WXUNUSED(pbase), toff_t* WXUNUSED(psize)) { @@ -130,26 +159,42 @@ _tiffMapProc(thandle_t WXUNUSED(handle), } void TIFFLINKAGEMODE -_tiffUnmapProc(thandle_t WXUNUSED(handle), +wxTIFFUnmapProc(thandle_t WXUNUSED(handle), tdata_t WXUNUSED(base), toff_t WXUNUSED(size)) { } static void -TIFFwxWarningHandler(const char* module, const char* fmt, va_list ap) +TIFFwxWarningHandler(const char* module, + const char* WXUNUSED_IN_UNICODE(fmt), + va_list WXUNUSED_IN_UNICODE(ap)) { if (module != NULL) - wxLogWarning(_("tiff module: %s"), module); - wxLogWarning((wxChar *) fmt, ap); + wxLogWarning(_("tiff module: %s"), wxString::FromAscii(module).c_str()); + + // FIXME: this is not terrible informative but better than crashing! +#if wxUSE_UNICODE + wxLogWarning(_("TIFF library warning.")); +#else + wxVLogWarning(fmt, ap); +#endif } static void -TIFFwxErrorHandler(const char* module, const char* fmt, va_list ap) +TIFFwxErrorHandler(const char* module, + const char* WXUNUSED_IN_UNICODE(fmt), + va_list WXUNUSED_IN_UNICODE(ap)) { if (module != NULL) - wxLogError(_("tiff module: %s"), module); - wxVLogError((wxChar *) fmt, ap); + wxLogError(_("tiff module: %s"), wxString::FromAscii(module).c_str()); + + // FIXME: as above +#if wxUSE_UNICODE + wxLogError(_("TIFF library error.")); +#else + wxVLogError(fmt, ap); +#endif } } // extern "C" @@ -159,9 +204,9 @@ TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode) { TIFF* tif = TIFFClientOpen(name, mode, (thandle_t) &stream, - _tiffReadProc, _tiffNullProc, - _tiffSeekIProc, _tiffCloseProc, _tiffSizeProc, - _tiffMapProc, _tiffUnmapProc); + wxTIFFReadProc, wxTIFFNullProc, + wxTIFFSeekIProc, wxTIFFCloseIProc, wxTIFFSizeProc, + wxTIFFMapProc, wxTIFFUnmapProc); return tif; } @@ -171,9 +216,9 @@ TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode) { TIFF* tif = TIFFClientOpen(name, mode, (thandle_t) &stream, - _tiffNullProc, _tiffWriteProc, - _tiffSeekOProc, _tiffCloseProc, _tiffSizeProc, - _tiffMapProc, _tiffUnmapProc); + wxTIFFNullProc, wxTIFFWriteProc, + wxTIFFSeekOProc, wxTIFFCloseOProc, wxTIFFSizeProc, + wxTIFFMapProc, wxTIFFUnmapProc); return tif; } @@ -222,6 +267,14 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w ); TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &h ); + uint16 extraSamples; + uint16* samplesInfo; + TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES, + &extraSamples, &samplesInfo); + const bool hasAlpha = (extraSamples == 1 && + (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA || + samplesInfo[0] == EXTRASAMPLE_UNASSALPHA)); + npixels = w * h; raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) ); @@ -248,6 +301,9 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos return false; } + if ( hasAlpha ) + image->SetAlpha(); + if (!TIFFReadRGBAImage( tif, w, h, raster, 0 )) { if (verbose) @@ -260,47 +316,38 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos return false; } - bool hasmask = 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; j < w; j++) { - unsigned char alpha = (unsigned char)TIFFGetA(raster[pos]); - 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)TIFFGetR(raster[pos]); - ptr++; - ptr[0] = (unsigned char)TIFFGetG(raster[pos]); - ptr++; - ptr[0] = (unsigned char)TIFFGetB(raster[pos]); - ptr++; - } + *(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++; } - ptr -= 2*w*3; // subtract line we just added plus one line + + // subtract line we just added plus one line: + ptr -= 2*w*3; + if ( hasAlpha ) + alpha -= 2*w; } _TIFFfree( raster ); TIFFClose( tif ); - image->SetMask( hasmask ); - return true; } @@ -343,9 +390,9 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo image->HasOption(wxIMAGE_OPTION_RESOLUTIONY) ) { TIFFSetField(tif, TIFFTAG_XRESOLUTION, - image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX)); + (float)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX)); TIFFSetField(tif, TIFFTAG_YRESOLUTION, - image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY)); + (float)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY)); } int spp = image->GetOptionInt(wxIMAGE_OPTION_SAMPLESPERPIXEL); @@ -358,7 +405,13 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo int compression = image->GetOptionInt(wxIMAGE_OPTION_COMPRESSION); if ( !compression ) - compression=COMPRESSION_LZW; + { + // 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); @@ -414,7 +467,7 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo if ( ptr[column*24 + bp*3] > 0 ) { // check only red as this is sufficient - reverse = reverse | 128 >> bp; + reverse = (uint8)(reverse | 128 >> bp); } } @@ -460,4 +513,3 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream ) #endif // wxUSE_STREAMS #endif // wxUSE_LIBTIFF -