X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..da8b1d4b3b535aba94d04494f5b6e2b3e47901ee:/include/wx/imagtiff.h diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h index 5d539336a8..734bef514c 100644 --- a/include/wx/imagtiff.h +++ b/include/wx/imagtiff.h @@ -10,42 +10,41 @@ #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 -{ - DECLARE_DYNAMIC_CLASS(wxTIFFHandler) -public: +#include "wx/image.h" - inline wxTIFFHandler() - { - m_name = "TIFF file"; - m_extension = "tif"; - m_type = wxBITMAP_TYPE_TIF; - m_mime = "image/tiff"; - }; +// defines for wxImage::SetOption +#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(wxT("BitsPerSample")) +#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel")) +#define wxIMAGE_OPTION_COMPRESSION wxString(wxT("Compression")) +#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor")) + +class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler +{ +public: + wxTIFFHandler(); #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 DoCanRead( wxInputStream& stream ); - virtual int GetImageCount( wxInputStream& stream ); + 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 ); #endif + +private: + DECLARE_DYNAMIC_CLASS(wxTIFFHandler) }; -#endif +#endif // wxUSE_LIBTIFF -#endif - // _WX_IMAGTIFF_H_ +#endif // _WX_IMAGTIFF_H_