/////////////////////////////////////////////////////////////////////////////
-// Name: imagtiff.cpp
+// Name: src/common/imagtiff.cpp
// Purpose: wxImage TIFF handler
// Author: Robert Roebling
// RCS-ID: $Id$
// 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"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/intl.h"
+#endif
+
#include "wx/bitmap.h"
-#include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/app.h"
+
extern "C"
{
#include "tiff.h"
}
#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
//-----------------------------------------------------------------------------
#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"
{
{
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
{
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)
{
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)
{
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
}
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"
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_SAMPLESPERPIXEL, 3);
- TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8);
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;
+ if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
+ image->HasOption(wxIMAGE_OPTION_RESOLUTIONY) )
+ {
+ TIFFSetField(tif, TIFFTAG_XRESOLUTION,
+ (float)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX));
+ TIFFSetField(tif, TIFFTAG_YRESOLUTION,
+ (float)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY));
+ }
+
+ 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)
+ if (TIFFScanlineSize(tif) > linebytes || (spp * bpp < 24))
{
buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
if (!buf)
buf = NULL;
}
- TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,
- TIFFDefaultStripSize(tif, (uint32) -1));
+ 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 ( 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 ( TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0 )
{
if (verbose)
wxLogError( _("TIFF: Error writing image.") );
return false;
}
+
ptr += image->GetWidth()*3;
}
(void) TIFFClose(tif);
if (buf)
- _TIFFfree(buf);
+ _TIFFfree(buf);
return true;
}
#endif // wxUSE_STREAMS
#endif // wxUSE_LIBTIFF
-
projects / wxWidgets.git / blobdiff