X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a632f1056d7894daca7342394c1db9b61f6aecf..60149370ac34d59e136a3aab6b00388d8306ae8d:/include/wx/image.h?ds=inline

diff --git a/include/wx/image.h b/include/wx/image.h
index 09aa6ed4a2..adfce58b9c 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -24,6 +24,8 @@
 #  include "wx/stream.h"
 #endif
 
+#if wxUSE_IMAGE
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
@@ -89,6 +91,7 @@ class WXDLLEXPORT wxImage: public wxObject
 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 );
@@ -97,19 +100,29 @@ public:
     wxImage( const wxImage& image );
     wxImage( const wxImage* image );
 
-    // these functions get implemented in /src/(platform)/bitmap.cpp
+#if wxUSE_GUI
+    // convertion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
     wxImage( const wxBitmap &bitmap );
-    operator wxBitmap() const { return ConvertToBitmap(); }
     wxBitmap ConvertToBitmap() const;
 #ifdef __WXGTK__
-    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue );
+    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
+#endif
 #endif
 
     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;
@@ -120,17 +133,23 @@ public:
     // 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 ;
+                   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 );
-    unsigned char GetGreen( int x, int y );
-    unsigned char GetBlue( int x, int y );
+    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 );
@@ -156,7 +175,9 @@ public:
 
     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;
@@ -164,6 +185,18 @@ public:
     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 );
 
@@ -192,7 +225,7 @@ public:
     static void InitStandardHandlers();
 
 protected:
-    static wxList sm_handlers;
+    static wxList   sm_handlers;
 
 private:
     friend class WXDLLEXPORT wxImageHandler;
@@ -203,6 +236,7 @@ private:
 
 extern void WXDLLEXPORT wxInitAllImageHandlers();
 
+WXDLLEXPORT_DATA(extern wxImage)    wxNullImage;
 
 //-----------------------------------------------------------------------------
 // wxImage handlers
@@ -215,6 +249,9 @@ extern void WXDLLEXPORT wxInitAllImageHandlers();
 #include "wx/imagjpeg.h"
 #include "wx/imagtiff.h"
 #include "wx/imagpnm.h"
+#include "wx/imagxpm.h"
+
+#endif // wxUSE_IMAGE
 
 #endif
   // _WX_IMAGE_H_