A little fix for Vadim's fix

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

diff --git a/include/wx/image.h b/include/wx/image.h
index a8cf85145db9ed52e04abe3ba6457ba90c140bbb..4c145b247d858825f45956b1b24e0534a8cda906 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGE_H_


@@ -18,14 +18,19 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"

+#include "wx/bitmap.h"
+
+#if wxUSE_STREAMS
+#  include "wx/stream.h"
+#endif
+
+#if wxUSE_IMAGE

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;

-class WXDLLEXPORT wxPNGHandler;
-class WXDLLEXPORT wxBMPHandler;

 class WXDLLEXPORT wxImage;
 
 //-----------------------------------------------------------------------------
 class WXDLLEXPORT wxImage;
 
 //-----------------------------------------------------------------------------


@@ -34,131 +39,222 @@ class WXDLLEXPORT wxImage;
 
 class WXDLLEXPORT wxImageHandler: public wxObject
 {
 
 class WXDLLEXPORT wxImageHandler: public wxObject
 {

-  DECLARE_DYNAMIC_CLASS(wxImageHandler)
-  

 public:
 public:

-  wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
-
-  virtual bool LoadFile( wxImage *image, const wxString& name );
-  virtual bool SaveFile( wxImage *image, const wxString& name );
-
-  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 wxString GetName() const { return m_name; }
-  inline wxString GetExtension() const { return m_extension; }
-  inline long GetType() const { return m_type; }
-  
+    wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
+
+#if wxUSE_STREAMS
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+
+    virtual int GetImageCount( wxInputStream& stream );
+
+    bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
+    bool CanRead( const wxString& name );
+#endif // wxUSE_STREAMS
+
+    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:
 protected:

-  wxString  m_name;
-  wxString  m_extension;
-  long      m_type;
-  
+#if wxUSE_STREAMS
+    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)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxPNGHandler
+// wxImage

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPNGHandler: public wxImageHandler
+class WXDLLEXPORT wxHNode

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPNGHandler)
-  

 public:
 public:

-
-  inline wxPNGHandler()
-  {
-      m_name = "PNG file";
-      m_extension = "png";
-      m_type = wxBITMAP_TYPE_PNG;
-  };
-
-  virtual bool LoadFile( wxImage *image, const wxString& name );
-  virtual bool SaveFile( wxImage *image, const wxString& name );
+    unsigned long index;
+    unsigned long value;

 };
 
 };
 

-//-----------------------------------------------------------------------------
-// wxBMPHandler
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxBMPHandler: public wxImageHandler
+class WXDLLEXPORT wxImage: public wxObject

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBMPHandler)
-  

 public:
 public:

+    wxImage();
+    wxImage( int width, int height );
+    wxImage( int width, int height, unsigned char* data, bool static_data = FALSE );
+    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 );

 
 

-  inline wxBMPHandler()
-  {
-      m_name = "BMP file";
-      m_extension = "bmp";
-      m_type = wxBITMAP_TYPE_BMP;
-  };
+    wxImage( const wxImage& image );
+    wxImage( const wxImage* image );

 
 

-  virtual bool LoadFile( wxImage *image, const wxString& name );
-};
+#if wxUSE_GUI
+    // convertion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
+    wxImage( const wxBitmap &bitmap );
+    wxBitmap ConvertToBitmap() const;
+#ifdef __WXGTK__
+    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
+#endif
+#endif

 
 

-//-----------------------------------------------------------------------------
-// wxImage
-//-----------------------------------------------------------------------------
+    void Create( int width, int height );
+    void Create( int width, int height, unsigned char* data, bool static_data = FALSE );
+    void Destroy();

 
 

-class WXDLLEXPORT wxImage: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxImage)
+    // creates an identical copy of the image (the = operator
+    // just raises the ref count)
+    wxImage Copy() const;
+    
+    // return the new image with size width*height
+    wxImage GetSubImage( const wxRect& ) const;
+    
+    // pastes image into this instance and takes care of
+    // the mask colour and out of bounds problems
+    void Paste( const wxImage &image, int x, int y );    

 
 

-  friend class WXDLLEXPORT wxImageHandler;
+    // return the new image with size width*height
+    wxImage Scale( int width, int height ) const;

 
 

-public:
+    // rescales the image in place
+    wxImage& Rescale( int width, int height ) { return *this = Scale(width, height); }
+
+    // Rotates the image about the given point, 'angle' radians.
+    // Returns the rotated image, leaving this image intact.
+    wxImage Rotate(double angle, const wxPoint & centre_of_rotation,
+                   bool interpolating = TRUE, wxPoint * offset_after_rotation = (wxPoint*) NULL) const;
+
+    wxImage Rotate90( bool clockwise = TRUE ) const;
+    wxImage Mirror( bool horizontally = TRUE ) const;

 
 

-  wxImage();
-  wxImage( int width, int height );
-  wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );
-  
-  wxImage( const wxImage& image );
-  wxImage( const wxImage* image );
-
-  void Create( int width, int height );
-  void Destroy();
-  
-  virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );
-  virtual bool SaveFile( const wxString& name, int type );
-
-  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;
-
-  inline wxImage& operator = (const wxImage& image) 
-    { if (*this == image) return (*this); Ref(image); return *this; }
-  inline bool operator == (const wxImage& image) 
-    { return m_refData == image.m_refData; }
-  inline bool operator != (const wxImage& image) 
-    { return m_refData != image.m_refData; }
-
-  static inline 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 void CleanUpHandlers();
-  static void InitStandardHandlers();
+    // 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 );
+                 
+    // convert to monochrome image (<r,g,b> will be replaced by white, everything else by black)
+    wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const;
+
+    // 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 ) const;
+    unsigned char GetGreen( int x, int y ) const;
+    unsigned char GetBlue( int x, int y ) const;
+
+    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
+
+    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 );
+#endif
+
+    bool Ok() const;
+    int GetWidth() const;
+    int GetHeight() const;
+
+    char unsigned *GetData() const;
+    void SetData( char unsigned *data );
+    void SetData( char unsigned *data, int new_width, int new_height );
+
+    // Mask functions
+    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;
+
+#if wxUSE_PALETTE
+    // Palette functions
+    bool HasPalette() const;
+    const wxPalette& GetPalette() const;
+    void SetPalette(const wxPalette& palette);
+#endif // wxUSE_PALETTE
+
+    // Option functions (arbitrary name/value mapping)
+    void SetOption(const wxString& name, const wxString& value);
+    void SetOption(const wxString& name, int value);
+    wxString GetOption(const wxString& name) const;
+    int GetOptionInt(const wxString& name) const;
+    bool HasOption(const wxString& name) 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:
 
 protected:

+    static wxList   sm_handlers;
+
+private:
+    friend class WXDLLEXPORT wxImageHandler;

 
 

-  static wxList sm_handlers;
-  
+    DECLARE_DYNAMIC_CLASS(wxImage)

 };
 
 };
 

+
+extern void WXDLLEXPORT wxInitAllImageHandlers();
+
+WXDLLEXPORT_DATA(extern wxImage)    wxNullImage;
+
+//-----------------------------------------------------------------------------
+// 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"
+#include "wx/imagxpm.h"
+
+#endif // wxUSE_IMAGE
+

 #endif
   // _WX_IMAGE_H_
 #endif
   // _WX_IMAGE_H_

+