check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 2ad05614acabec8fc1a74341be8c3ef967331bcb..536cf3926c486eb7d2a9be294fc4dcab23404826 100644 (file)
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -4,42 +4,46 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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

+
+#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"))
+

 class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
 {
 public:
     wxTIFFHandler();
 
 #if wxUSE_STREAMS
 class WXDLLEXPORT 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 bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );

     virtual int GetImageCount( wxInputStream& stream );
     virtual int GetImageCount( wxInputStream& stream );

+protected:
+    virtual bool DoCanRead( 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_