X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0828c0875e1516e4bfc0aa5b0a84195a2ac92cca..bd73863347c81c1b41b3a7684f0219d44d1c53d2:/include/wx/image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index 3b351600e9..cded61d096 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -21,7 +21,7 @@
 #include "wx/bitmap.h"
 
 #if wxUSE_STREAMS
-    #include "wx/stream.h"
+#  include "wx/stream.h"
 #endif
 
 //-----------------------------------------------------------------------------
@@ -35,7 +35,19 @@ class WXDLLEXPORT wxPNGHandler;
 #if wxUSE_LIBJPEG
 class WXDLLEXPORT wxJPEGHandler;
 #endif
+#if wxUSE_LIBTIFF
+class WXDLLEXPORT wxTIFFHandler;
+#endif
 class WXDLLEXPORT wxBMPHandler;
+#if wxUSE_GIF
+class WXDLLEXPORT wxGIFHandler;
+#endif
+#if wxUSE_PNM
+class WXDLLEXPORT wxPNMHandler;
+#endif
+#if wxUSE_PCX
+class WXDLLEXPORT wxPCXHandler;
+#endif
 class WXDLLEXPORT wxImage;
 
 //-----------------------------------------------------------------------------
@@ -44,7 +56,7 @@ class WXDLLEXPORT wxImage;
 
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxImageHandler)
+  DECLARE_CLASS(wxImageHandler)
 
 public:
   wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
@@ -53,20 +65,22 @@ public:
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 
-  virtual bool CanRead( wxInputStream& stream );
-  virtual bool CanRead( const wxString& name );
+  bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
+  bool CanRead( const wxString& name );
 #endif
 
-  inline void SetName(const wxString& name) { m_name = name; }
-  inline void SetExtension(const wxString& ext) { m_extension = ext; }
-  inline void SetType(long type) { m_type = type; }
-  inline void SetMimeType(const wxString& type) { m_mime = type; }
-  inline wxString GetName() const { return m_name; }
-  inline wxString GetExtension() const { return m_extension; }
-  inline long GetType() const { return m_type; }
-  inline wxString GetMimeType() const { return m_mime; }
+  void SetName(const wxString& name) { m_name = name; }
+  void SetExtension(const wxString& ext) { m_extension = ext; }
+  void SetType(long type) { m_type = type; }
+  void SetMimeType(const wxString& type) { m_mime = type; }
+  wxString GetName() const { return m_name; }
+  wxString GetExtension() const { return m_extension; }
+  long GetType() const { return m_type; }
+  wxString GetMimeType() const { return m_mime; }
 
 protected:
+  virtual bool DoCanRead( wxInputStream& stream ) = 0;
+
   wxString  m_name;
   wxString  m_extension;
   wxString  m_mime;
@@ -96,7 +110,7 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
+  virtual bool DoCanRead( wxInputStream& stream );
 #endif
 };
 #endif
@@ -123,7 +137,34 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
+  virtual bool DoCanRead( wxInputStream& stream );
+#endif
+};
+#endif
+
+//-----------------------------------------------------------------------------
+// wxTIFFHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBTIFF
+class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxTIFFHandler)
+
+public:
+
+  inline wxTIFFHandler()
+  {
+      m_name = "TIFF file";
+      m_extension = "tif";
+      m_type = wxBITMAP_TYPE_TIF;
+      m_mime = "image/tiff";
+  };
+
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+  virtual bool DoCanRead( wxInputStream& stream );
 #endif
 };
 #endif
@@ -148,7 +189,7 @@ public:
 
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
+  virtual bool DoCanRead( wxInputStream& stream );
 #endif
 };
 
@@ -156,6 +197,8 @@ public:
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
+#if wxUSE_GIF
+
 class WXDLLEXPORT wxGIFHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxGIFHandler)
@@ -173,14 +216,16 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
+  virtual bool DoCanRead( wxInputStream& stream );
 #endif
 };
+#endif
 
 //-----------------------------------------------------------------------------
 // wxPNMHandler
 //-----------------------------------------------------------------------------
 
+#if wxUSE_PNM
 class WXDLLEXPORT wxPNMHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNMHandler)
@@ -198,9 +243,37 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
+  virtual bool DoCanRead( wxInputStream& stream );
+#endif
+};
 #endif
+
+//-----------------------------------------------------------------------------
+// wxPCXHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_PCX
+class WXDLLEXPORT wxPCXHandler : public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxPCXHandler)
+
+public:
+
+  inline wxPCXHandler()
+  {
+      m_name = "PCX file";
+      m_extension = "pcx";
+      m_type = wxBITMAP_TYPE_PCX;
+      m_mime = "image/pcx";
+  };
+
+#if wxUSE_STREAMS
+  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+  virtual bool DoCanRead( wxInputStream& stream );
+#endif // wxUSE_STREAMS
 };
+#endif // wxUSE_PCX
 
 //-----------------------------------------------------------------------------
 // wxImage
@@ -247,10 +320,12 @@ public:
   unsigned char GetGreen( int x, int y );
   unsigned char GetBlue( int x, int y );
 
+  static bool CanRead( const wxString& name );
   virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY );
   virtual bool LoadFile( const wxString& name, const wxString& mimetype );
 
 #if wxUSE_STREAMS
+  static bool CanRead( wxInputStream& stream );
   virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
   virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );
 #endif
@@ -307,6 +382,8 @@ protected:
 
 };
 
+extern void WXDLLEXPORT wxInitAllImageHandlers();
+
 #endif
   // _WX_IMAGE_H_