Fix wxRect::SetRightTop() which set the wrong corner.

[wxWidgets.git] / include / wx / imagtiff.h

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 4607162bf06459fe0819ef1cd61baf8fe463c8af..2c90bb5e577238703651d46e384429a3d223aca7 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -10,36 +10,44 @@
 #ifndef _WX_IMAGTIFF_H_
 #define _WX_IMAGTIFF_H_
 
 #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
 
 //-----------------------------------------------------------------------------
 // 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();
 
 {
 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 );
 #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 bool DoCanRead( wxInputStream& stream );

-    virtual int GetImageCount( wxInputStream& stream );

 #endif
 
 private:
     DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
 };
 #endif
 
 private:
     DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
 };

-#endif

 
 

+#endif // wxUSE_LIBTIFF

 
 

-#endif
-  // _WX_IMAGTIFF_H_
+#endif // _WX_IMAGTIFF_H_