X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/232806507ba60bd768605f0d7e8ae8e27dc17e8b..9d9b77552eeb78e0c7ee903aa265dc187651ff57:/include/wx/image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index 7db3f34479..893e272c2e 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
 
 //-----------------------------------------------------------------------------
@@ -29,13 +29,6 @@
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;
-#if wxUSE_LIBPNG
-class WXDLLEXPORT wxPNGHandler;
-#endif
-#if wxUSE_LIBJPEG
-class WXDLLEXPORT wxJPEGHandler;
-#endif
-class WXDLLEXPORT wxBMPHandler;
 class WXDLLEXPORT wxImage;
 
 //-----------------------------------------------------------------------------
@@ -44,234 +37,177 @@ class WXDLLEXPORT wxImage;
 
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxImageHandler)
-
-public:
-  wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
-
-#if wxUSE_STREAMS
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
-#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; }
-
-protected:
-  wxString  m_name;
-  wxString  m_extension;
-  wxString  m_mime;
-  long      m_type;
-
-};
-
-//-----------------------------------------------------------------------------
-// wxPNGHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_LIBPNG
-class WXDLLEXPORT wxPNGHandler: public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxPNGHandler)
-
-public:
-
-  inline wxPNGHandler()
-  {
-      m_name = "PNG file";
-      m_extension = "png";
-      m_type = wxBITMAP_TYPE_PNG;
-      m_mime = "image/png";
-  };
-
-#if wxUSE_STREAMS
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
-#endif
-};
-#endif
-
-//-----------------------------------------------------------------------------
-// wxJPEGHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_LIBJPEG
-class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
-
 public:
-
-  inline wxJPEGHandler()
-  {
-      m_name = "JPEG file";
-      m_extension = "jpg";
-      m_type = wxBITMAP_TYPE_JPEG;
-      m_mime = "image/jpeg";
-  };
+    wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
 
 #if wxUSE_STREAMS
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
-#endif
-};
-#endif
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
 
-//-----------------------------------------------------------------------------
-// wxBMPHandler
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxBMPHandler: public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxBMPHandler)
+    virtual int GetImageCount( wxInputStream& stream );
 
-public:
+    bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
+    bool CanRead( const wxString& name );
+#endif // wxUSE_STREAMS
 
-  inline wxBMPHandler()
-  {
-      m_name = "BMP file";
-      m_extension = "bmp";
-      m_type = wxBITMAP_TYPE_BMP;
-      m_mime = "image/bmp";
-  };
+    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:
 #if wxUSE_STREAMS
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
-#endif
+    virtual bool DoCanRead( wxInputStream& stream ) = 0;
+#endif // wxUSE_STREAMS
+
+    wxString  m_name;
+    wxString  m_extension;
+    wxString  m_mime;
+    long      m_type;
+    
+private:
+    DECLARE_CLASS(wxImageHandler)
 };
 
 //-----------------------------------------------------------------------------
-// wxGIFHandler
+// wxImage
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGIFHandler : public wxImageHandler
+class WXDLLEXPORT wxHNode
 {
-  DECLARE_DYNAMIC_CLASS(wxGIFHandler)
-
 public:
-
-  inline wxGIFHandler()
-  {
-      m_name = "GIF file";
-      m_extension = "gif";
-      m_type = wxBITMAP_TYPE_GIF;
-      m_mime = "image/gif";
-  };
-
-#if wxUSE_STREAMS
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
-#endif
+    unsigned long index;
+    unsigned long value;
 };
 
-//-----------------------------------------------------------------------------
-// wxImage
-//-----------------------------------------------------------------------------
-
 class WXDLLEXPORT wxImage: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxImage)
-
-  friend class WXDLLEXPORT wxImageHandler;
-
 public:
+    wxImage();
+    wxImage( int width, int height );
+    wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY );
+    wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
+    wxImage( const wxString& name, const wxString& mimetype );
+    wxImage( wxInputStream& stream, const wxString& mimetype );
+
+    wxImage( const wxImage& image );
+    wxImage( const wxImage* image );
 
-  wxImage();
-  wxImage( int width, int height );
-  wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );
-  wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
-  wxImage( const wxString& name, const wxString& mimetype );
-  wxImage( wxInputStream& stream, const wxString& mimetype );
+    // these functions get implemented in /src/(platform)/bitmap.cpp
+    wxImage( const wxBitmap &bitmap );
+    operator wxBitmap() const { return ConvertToBitmap(); }
+    wxBitmap ConvertToBitmap() const;
 
-  wxImage( const wxImage& image );
-  wxImage( const wxImage* image );
+    void Create( int width, int height );
+    void Destroy();
 
-  // these functions get implemented in /src/(platform)/bitmap.cpp
-  wxImage( const wxBitmap &bitmap );
-  operator wxBitmap() const { return ConvertToBitmap(); }
-  wxBitmap ConvertToBitmap() const;
+    // return the new image with size width*height
+    wxImage GetSubImage( const wxRect& ) const;
 
-  void Create( int width, int height );
-  void Destroy();
+    // return the new image with size width*height
+    wxImage Scale( int width, int height ) const;
 
-  // return the new image with size width*height
-  wxImage Scale( int width, int height ) const;
+    // rescales the image in place
+    wxImage& Rescale( int width, int height ) { return *this = Scale(width, height); }
 
-  // rescales the image in place
-  void Rescale( int width, int height ) { *this = Scale(width, height); }
+    // replace one colour with another
+    void Replace( unsigned char r1, unsigned char g1, unsigned char b1,
+                  unsigned char r2, unsigned char g2, unsigned char b2 );
 
-  // these routines are slow but safe
-  void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
-  unsigned char GetRed( int x, int y );
-  unsigned char GetGreen( int x, int y );
-  unsigned char GetBlue( int x, int y );
+    // these routines are slow but safe
+    void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
+    unsigned char GetRed( int x, int y );
+    unsigned char GetGreen( int x, int y );
+    unsigned char GetBlue( int x, int y );
 
-  virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );
-  virtual bool LoadFile( const wxString& name, const wxString& mimetype );
+    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
-  virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
-  virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );
+    static bool CanRead( wxInputStream& stream );
+    virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
+    virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );
 #endif
 
-  virtual bool SaveFile( const wxString& name, int type );
-  virtual bool SaveFile( const wxString& name, const wxString& mimetype );
+    virtual bool SaveFile( const wxString& name, int type );
+    virtual bool SaveFile( const wxString& name, const wxString& mimetype );
 
 #if wxUSE_STREAMS
-  virtual bool SaveFile( wxOutputStream& stream, int type );
-  virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype );
+    virtual bool SaveFile( wxOutputStream& stream, int type );
+    virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype );
 #endif
 
-  bool Ok() const;
-  int GetWidth() const;
-  int GetHeight() const;
-
-  char unsigned *GetData() const;
-  void SetData( char unsigned *data );
-
-  void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
-  unsigned char GetMaskRed() const;
-  unsigned char GetMaskGreen() const;
-  unsigned char GetMaskBlue() const;
-  void SetMask( bool mask = TRUE );
-  bool HasMask() const;
-
-  wxImage& operator = (const wxImage& image)
-  {
-    if ( (*this) != image )
-      Ref(image);
-    return *this;
-  }
-
-  bool operator == (const wxImage& image)
-    { return m_refData == image.m_refData; }
-  bool operator != (const wxImage& image)
-    { return m_refData != image.m_refData; }
-
-  static wxList& GetHandlers() { return sm_handlers; }
-  static void AddHandler( wxImageHandler *handler );
-  static void InsertHandler( wxImageHandler *handler );
-  static bool RemoveHandler( const wxString& name );
-  static wxImageHandler *FindHandler( const wxString& name );
-  static wxImageHandler *FindHandler( const wxString& extension, long imageType );
-  static wxImageHandler *FindHandler( long imageType );
-  static wxImageHandler *FindHandlerMime( const wxString& mimetype );
-
-  static void CleanUpHandlers();
-  static void InitStandardHandlers();
+    bool Ok() const;
+    int GetWidth() const;
+    int GetHeight() const;
+
+    char unsigned *GetData() const;
+    void SetData( char unsigned *data );
+
+    void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
+    unsigned char GetMaskRed() const;
+    unsigned char GetMaskGreen() const;
+    unsigned char GetMaskBlue() const;
+    void SetMask( bool mask = TRUE );
+    bool HasMask() const;
+
+    unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 );
+    unsigned long ComputeHistogram( wxHashTable &h );
+
+    wxImage& operator = (const wxImage& image)
+    {
+        if ( (*this) != image )
+            Ref(image);
+        return *this;
+    }
+
+    bool operator == (const wxImage& image)
+        { return m_refData == image.m_refData; }
+    bool operator != (const wxImage& image)
+        { return m_refData != image.m_refData; }
+
+    static wxList& GetHandlers() { return sm_handlers; }
+    static void AddHandler( wxImageHandler *handler );
+    static void InsertHandler( wxImageHandler *handler );
+    static bool RemoveHandler( const wxString& name );
+    static wxImageHandler *FindHandler( const wxString& name );
+    static wxImageHandler *FindHandler( const wxString& extension, long imageType );
+    static wxImageHandler *FindHandler( long imageType );
+    static wxImageHandler *FindHandlerMime( const wxString& mimetype );
+
+    static void CleanUpHandlers();
+    static void InitStandardHandlers();
 
 protected:
+    static wxList sm_handlers;
 
-  static wxList sm_handlers;
+private:
+    friend class WXDLLEXPORT wxImageHandler;
 
+    DECLARE_DYNAMIC_CLASS(wxImage)
 };
 
+
+extern void WXDLLEXPORT wxInitAllImageHandlers();
+
+
+//-----------------------------------------------------------------------------
+// wxImage handlers
+//-----------------------------------------------------------------------------
+
+#include "wx/imagbmp.h"
+#include "wx/imagpng.h"
+#include "wx/imaggif.h"
+#include "wx/imagpcx.h"
+#include "wx/imagjpeg.h"
+#include "wx/imagtiff.h"
+#include "wx/imagpnm.h"
+
 #endif
   // _WX_IMAGE_H_