X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fc7f695cea35b94832e03cbf2a0e74998293ba2..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/imagtiff.h?ds=sidebyside diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h index 1f953b3f4a..f1f4f74c6f 100644 --- a/include/wx/imagtiff.h +++ b/include/wx/imagtiff.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagtiff.h +// Name: wx/imagtiff.h // Purpose: wxImage TIFF handler // Author: Robert Roebling // RCS-ID: $Id$ @@ -10,36 +10,51 @@ #ifndef _WX_IMAGTIFF_H_ #define _WX_IMAGTIFF_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "imagtiff.h" -#endif - -#include "wx/image.h" - +#include "wx/defs.h" //----------------------------------------------------------------------------- // wxTIFFHandler //----------------------------------------------------------------------------- #if wxUSE_LIBTIFF -class WXDLLEXPORT wxTIFFHandler: public wxImageHandler + +#include "wx/image.h" +#include "wx/versioninfo.h" + +// defines for wxImage::SetOption +#define wxIMAGE_OPTION_TIFF_BITSPERSAMPLE wxString(wxT("BitsPerSample")) +#define wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel")) +#define wxIMAGE_OPTION_TIFF_COMPRESSION wxString(wxT("Compression")) +#define wxIMAGE_OPTION_TIFF_PHOTOMETRIC wxString(wxT("Photometric")) +#define wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor")) + +// for backwards compatibility +#define wxIMAGE_OPTION_BITSPERSAMPLE wxIMAGE_OPTION_TIFF_BITSPERSAMPLE +#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL +#define wxIMAGE_OPTION_COMPRESSION wxIMAGE_OPTION_TIFF_COMPRESSION +#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR + +class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler { public: wxTIFFHandler(); + static wxVersionInfo GetLibraryVersionInfo(); + #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 ); + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true ); + +protected: + virtual int DoGetImageCount( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream ); - virtual int GetImageCount( wxInputStream& stream ); #endif private: DECLARE_DYNAMIC_CLASS(wxTIFFHandler) }; -#endif +#endif // wxUSE_LIBTIFF -#endif - // _WX_IMAGTIFF_H_ +#endif // _WX_IMAGTIFF_H_