// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "imagtiff.h"
#endif
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))
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;
return stream->LastRead();
}
-static tsize_t TIFFLINKAGEMODE
+tsize_t TIFFLINKAGEMODE
_tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
{
wxOutputStream *stream = (wxOutputStream*) handle;
return stream->LastWrite();
}
-static toff_t TIFFLINKAGEMODE
+toff_t TIFFLINKAGEMODE
_tiffSeekIProc(thandle_t handle, toff_t off, int whence)
{
wxInputStream *stream = (wxInputStream*) handle;
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;
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))
return 0;
}
-static void TIFFLINKAGEMODE
+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)
{
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" );
if (verbose)
wxLogError( _("TIFF: Error loading image.") );
- return FALSE;
+ return false;
}
if (!TIFFSetDirectory( tif, (tdir_t)index ))
TIFFClose( tif );
- return FALSE;
+ return false;
}
uint32 w, h;
TIFFClose( tif );
- return FALSE;
+ return false;
}
image->Create( (int)w, (int)h );
_TIFFfree( raster );
TIFFClose( tif );
- return FALSE;
+ return false;
}
if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
image->Destroy();
TIFFClose( tif );
- return FALSE;
+ return false;
}
- bool hasmask = FALSE;
+ bool hasmask = false;
unsigned char *ptr = image->GetData();
ptr += w*3*(h-1);
unsigned char alpha = (unsigned char)TIFFGetA(raster[pos]);
if (alpha < 127)
{
- hasmask = TRUE;
+ hasmask = true;
ptr[0] = image->GetMaskRed();
ptr++;
ptr[0] = image->GetMaskGreen();
image->SetMask( hasmask );
- return TRUE;
+ return true;
}
int wxTIFFHandler::GetImageCount( wxInputStream& stream )
if (verbose)
wxLogError( _("TIFF: Error saving image.") );
- return FALSE;
+ return false;
}
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, (uint32)image->GetWidth());
TIFFClose( tif );
- return FALSE;
+ return false;
}
}
else
if (buf)
_TIFFfree(buf);
- return FALSE;
+ return false;
}
ptr += image->GetWidth()*3;
}
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