X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..360ae33f4392ebb8b625b8ef3b2542b58f8a3a6b:/include/wx/imagtiff.h?ds=sidebyside

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 67657d6d4f..44e8c6fa64 100644
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -10,12 +10,17 @@
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "imagtiff.h"
 #endif
 
 #include "wx/image.h"
 
+// defines for wxImage::SetOption
+#define wxIMAGE_OPTION_BITSPERSAMPLE               wxString(_T("BitsPerSample"))
+#define wxIMAGE_OPTION_SAMPLESPERPIXEL             wxString(_T("SamplesPerPixel"))
+#define wxIMAGE_OPTION_COMPRESSION                 wxString(_T("Compression"))
+#define wxIMAGE_OPTION_IMAGEDESCRIPTOR             wxString(_T("ImageDescriptor"))
 
 //-----------------------------------------------------------------------------
 // wxTIFFHandler
@@ -25,17 +30,11 @@
 class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
 {
 public:
-    inline wxTIFFHandler()
-    {
-        m_name = wxT("TIFF file");
-        m_extension = wxT("tif");
-        m_type = wxBITMAP_TYPE_TIF;
-        m_mime = wxT("image/tiff");
-    }
+    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 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 );
 #endif