X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd85921189610501e38fb501801b1eb6b9560fe7..57fbe23f68f9ef92b8ef7e26bd06b399b53e33b2:/include/wx/image.h diff --git a/include/wx/image.h b/include/wx/image.h index 44a63769c2..257fd9773b 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -10,7 +10,7 @@ #ifndef _WX_IMAGE_H_ #define _WX_IMAGE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "image.h" #endif @@ -19,11 +19,16 @@ #include "wx/string.h" #include "wx/gdicmn.h" #include "wx/bitmap.h" +#include "wx/hashmap.h" #if wxUSE_STREAMS # include "wx/stream.h" #endif +#if wxUSE_IMAGE + +#define wxIMAGE_OPTION_FILENAME wxString(_T("FileName")) + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- @@ -38,15 +43,17 @@ class WXDLLEXPORT wxImage; class WXDLLEXPORT wxImageHandler: public wxObject { public: - wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; } + wxImageHandler() + : m_name(wxT("")), m_extension(wxT("")), m_mime(), m_type(0) + { } #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 ); + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual int GetImageCount( wxInputStream& stream ); - bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); } + bool CanRead( wxInputStream& stream ) { return CallDoCanRead(stream); } bool CanRead( const wxString& name ); #endif // wxUSE_STREAMS @@ -62,49 +69,63 @@ public: protected: #if wxUSE_STREAMS virtual bool DoCanRead( wxInputStream& stream ) = 0; + + // save the stream position, call DoCanRead() and restore the position + bool CallDoCanRead(wxInputStream& stream); #endif // wxUSE_STREAMS wxString m_name; wxString m_extension; wxString m_mime; long m_type; - + private: DECLARE_CLASS(wxImageHandler) }; //----------------------------------------------------------------------------- -// wxImage +// wxImageHistogram //----------------------------------------------------------------------------- -class WXDLLEXPORT wxHNode +class WXDLLEXPORT wxImageHistogramEntry { public: + wxImageHistogramEntry() : index(0), value(0) {} unsigned long index; unsigned long value; }; +WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry, + wxIntegerHash, wxIntegerEqual, + wxImageHistogram); + +//----------------------------------------------------------------------------- +// wxImage +//----------------------------------------------------------------------------- + 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 ); - wxImage( wxInputStream& stream, const wxString& mimetype ); + wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 ); + wxImage( const wxString& name, const wxString& mimetype, int index = -1 ); + +#if wxUSE_STREAMS + wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 ); + wxImage( wxInputStream& stream, const wxString& mimetype, int index = -1 ); +#endif // wxUSE_STREAMS 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 ); - operator wxBitmap() const { return ConvertToBitmap(); } - wxBitmap ConvertToBitmap() const; +#if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI + // conversion to/from wxBitmap (deprecated, use wxBitmap's methods instead): + wxDEPRECATED( wxImage(const wxBitmap &bitmap) ); + wxDEPRECATED( 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 @@ -115,13 +136,13 @@ public: // 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 ); + void Paste( const wxImage &image, int x, int y ); // return the new image with size width*height wxImage Scale( int width, int height ) const; @@ -140,9 +161,9 @@ public: // 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 ( will be replaced by white, everything else by black) - wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ); + 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 ); @@ -150,22 +171,34 @@ public: unsigned char GetGreen( int x, int y ) const; unsigned char GetBlue( int x, int y ) const; + // find first colour that is not used in the image and has higher + // RGB values than + bool FindFirstUnusedColour( unsigned char *r, unsigned char *g, unsigned char *b, + unsigned char startR = 1, unsigned char startG = 0, + unsigned char startB = 0 ) const; + // Set image's mask to the area of 'mask' that has colour + bool SetMaskFromImage(const wxImage & mask, + unsigned char mr, unsigned char mg, unsigned char mb); + 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 ); + static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY ); + virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 ); + virtual bool LoadFile( const wxString& name, const wxString& mimetype, int index = -1 ); #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 ); + static int GetImageCount( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY ); + virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 ); + virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 ); #endif - virtual bool SaveFile( const wxString& name, int type ); - virtual bool SaveFile( const wxString& name, const wxString& mimetype ); + virtual bool SaveFile( const wxString& name ) const; + virtual bool SaveFile( const wxString& name, int type ) const; + virtual bool SaveFile( const wxString& name, const wxString& mimetype ) const; #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 ) const; + virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ) const; #endif bool Ok() const; @@ -184,10 +217,12 @@ public: 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); @@ -196,8 +231,15 @@ public: 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 ); + unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 ) const; + + // Computes the histogram of the image and fills a hash table, indexed + // with integer keys built as 0xRRGGBB, containing wxImageHistogramEntry + // objects. Each of them contains an 'index' (useful to build a palette + // with the image colours) and a 'value', which is the number of pixels + // in the image with that colour. + // Returned value: # of entries in the histogram + unsigned long ComputeHistogram( wxImageHistogram &h ) const; wxImage& operator = (const wxImage& image) { @@ -206,9 +248,9 @@ public: return *this; } - bool operator == (const wxImage& image) + bool operator == (const wxImage& image) const { return m_refData == image.m_refData; } - bool operator != (const wxImage& image) + bool operator != (const wxImage& image) const { return m_refData != image.m_refData; } static wxList& GetHandlers() { return sm_handlers; } @@ -248,6 +290,10 @@ WXDLLEXPORT_DATA(extern wxImage) wxNullImage; #include "wx/imagjpeg.h" #include "wx/imagtiff.h" #include "wx/imagpnm.h" +#include "wx/imagxpm.h" +#include "wx/imagiff.h" + +#endif // wxUSE_IMAGE #endif // _WX_IMAGE_H_