X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beb59f36c016d27cf8949eb8c0d38fc63ad536a..afa111d52c46c5b35e2b7fdf6e1356460662eb99:/include/wx/imagtiff.h?ds=sidebyside

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 4607162bf0..2c90bb5e57 100644
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -10,36 +10,44 @@
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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_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();
 
+    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 );
+
+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_