fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/include/wx/image.h b/include/wx/image.h
index e4d78863ab2df78fab0a09fcd878aeab2d280acf..adfce58b9cd34e00783b82aff89c5c913b3b1af6 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -24,27 +24,13 @@
 #  include "wx/stream.h"
 #endif
 
 #  include "wx/stream.h"
 #endif
 

+#if wxUSE_IMAGE
+

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

-#if wxUSE_LIBPNG
-class WXDLLEXPORT wxPNGHandler;
-#endif
-#if wxUSE_LIBJPEG
-class WXDLLEXPORT wxJPEGHandler;
-#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;
 
 //-----------------------------------------------------------------------------
 class WXDLLEXPORT wxImage;
 
 //-----------------------------------------------------------------------------


@@ -53,317 +39,219 @@ 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; }
+    wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }

 
 #if wxUSE_STREAMS
 
 #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 LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );

 
 

-  virtual bool CanRead( wxInputStream& stream );
-  virtual 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; }
+    virtual int GetImageCount( wxInputStream& stream );

 
 

-protected:
-  wxString  m_name;
-  wxString  m_extension;
-  wxString  m_mime;
-  long      m_type;
+    bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
+    bool CanRead( const wxString& name );
+#endif // wxUSE_STREAMS

 
 

-};
-
-//-----------------------------------------------------------------------------
-// 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";
-  };
+    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
 #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 ) = 0;
+#endif // wxUSE_STREAMS
+
+    wxString  m_name;
+    wxString  m_extension;
+    wxString  m_mime;
+    long      m_type;
+    

 private:
 private:

-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
-#endif
+    DECLARE_CLASS(wxImageHandler)

 };
 };

-#endif

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

-// wxJPEGHandler
+// wxImage

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

-#if wxUSE_LIBJPEG
-class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
+class WXDLLEXPORT wxHNode

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
-

 public:
 public:

-
-  inline wxJPEGHandler()
-  {
-      m_name = "JPEG file";
-      m_extension = "jpg";
-      m_type = wxBITMAP_TYPE_JPEG;
-      m_mime = "image/jpeg";
-  };
-
-#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 );
-private:
-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
-#endif
+    unsigned long index;
+    unsigned long value;

 };
 };

-#endif
-
-//-----------------------------------------------------------------------------
-// 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 );
+
+    wxImage( const wxImage& image );
+    wxImage( const wxImage* image );
+
+#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

 
 

-  inline wxBMPHandler()
-  {
-      m_name = "BMP file";
-      m_extension = "bmp";
-      m_type = wxBITMAP_TYPE_BMP;
-      m_mime = "image/bmp";
-  };
+    void Create( int width, int height );
+    void Create( int width, int height, unsigned char* data, bool static_data = FALSE );
+    void Destroy();
+
+    // 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 );    
+
+    // 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); }
+
+    // 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;
+
+    // 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
 
 #if wxUSE_STREAMS

-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
-  virtual bool CanRead( wxInputStream& stream );
-private:
-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
+    static bool CanRead( wxInputStream& stream );
+    virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
+    virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );

 #endif
 #endif

-};
-
-//-----------------------------------------------------------------------------
-// wxGIFHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_GIF

 
 

-class WXDLLEXPORT wxGIFHandler : public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxGIFHandler)
-
-public:
-
-  inline wxGIFHandler()
-  {
-      m_name = "GIF file";
-      m_extension = "gif";
-      m_type = wxBITMAP_TYPE_GIF;
-      m_mime = "image/gif";
-  };
+    virtual bool SaveFile( const wxString& name, int type );
+    virtual bool SaveFile( const wxString& name, const wxString& mimetype );

 
 #if wxUSE_STREAMS
 
 #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 );
-private:
-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
-#endif
-};
+    virtual bool SaveFile( wxOutputStream& stream, int type );
+    virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype );

 #endif
 
 #endif
 

-//-----------------------------------------------------------------------------
-// wxPNMHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_PNM
-class WXDLLEXPORT wxPNMHandler : public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxPNMHandler)
-
-public:
+    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;
+
+    // Palette functions
+    bool HasPalette() const;
+    const wxPalette& GetPalette() const;
+    void SetPalette(const wxPalette& 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();

 
 

-  inline wxPNMHandler()
-  {
-      m_name = "PNM file";
-      m_extension = "pnm";
-      m_type = wxBITMAP_TYPE_PNM;
-      m_mime = "image/pnm";
-  };
+protected:
+    static wxList   sm_handlers;

 
 

-#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 );

 private:
 private:

-   // hiding base class virtuals again!
-  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
-#endif
-};
-#endif
+    friend class WXDLLEXPORT wxImageHandler;

 
 

-//-----------------------------------------------------------------------------
-// wxPCXHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_PCX
-class WXDLLEXPORT wxPCXHandler : public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxPCXHandler)
+    DECLARE_DYNAMIC_CLASS(wxImage)
+};

 
 

-public:

 
 

-  inline wxPCXHandler()
-  {
-      m_name = "PCX file";
-      m_extension = "pcx";
-      m_type = wxBITMAP_TYPE_PCX;
-      m_mime = "image/pcx";
-  };
+extern void WXDLLEXPORT wxInitAllImageHandlers();

 
 

-#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 );
-#endif
-};
-#endif
+WXDLLEXPORT_DATA(extern wxImage)    wxNullImage;

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

-// wxImage
+// wxImage handlers

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

-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 );
-
-  // these functions get implemented in /src/(platform)/bitmap.cpp
-  wxImage( const wxBitmap &bitmap );
-  operator wxBitmap() const { return ConvertToBitmap(); }
-  wxBitmap ConvertToBitmap() const;
-
-  void Create( int width, int height );
-  void Destroy();
-
-  // return the new image with size width*height
-  wxImage GetSubImage( const wxRect& ) const;
-
-  // return the new image with size width*height
-  wxImage Scale( int width, int height ) const;
-
-  // rescales the image in place
-  void Rescale( int width, int height ) { *this = Scale(width, height); }
-
-  // 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_ANY );
-  virtual bool LoadFile( const wxString& name, const wxString& mimetype );
-
-#if wxUSE_STREAMS
-  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 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();
- 
-protected:
-
-  static wxList sm_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"

 
 

-extern void wxInitAllImageHandlers();
+#endif // wxUSE_IMAGE

 
 #endif
   // _WX_IMAGE_H_
 
 #endif
   // _WX_IMAGE_H_