X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce9a75d225a393cd09681aeda19bec908e4c622d..f17fee68eac048a593e83f3a74d8a74f6a7ddacb:/include/wx/image.h diff --git a/include/wx/image.h b/include/wx/image.h index bd3d484582..b66e23c620 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -4,7 +4,7 @@ // Author: Robert Roebling // RCS-ID: $Id$ // Copyright: (c) Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_IMAGE_H_ @@ -18,9 +18,10 @@ #include "wx/object.h" #include "wx/string.h" #include "wx/gdicmn.h" +#include "wx/bitmap.h" #if wxUSE_STREAMS -#include "wx/stream.h" +# include "wx/stream.h" #endif //----------------------------------------------------------------------------- @@ -28,152 +29,63 @@ //----------------------------------------------------------------------------- class WXDLLEXPORT wxImageHandler; -#if wxUSE_LIBPNG -class WXDLLEXPORT wxPNGHandler; -#endif -#if wxUSE_LIBJPEG -class WXDLLEXPORT wxJPEGHandler; -#endif -class WXDLLEXPORT wxBMPHandler; class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxBitmap; - //----------------------------------------------------------------------------- // wxImageHandler //----------------------------------------------------------------------------- class WXDLLEXPORT wxImageHandler: public wxObject { - DECLARE_DYNAMIC_CLASS(wxImageHandler) - + DECLARE_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 + virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 ); + virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); - 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 ); + + 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: +#if wxUSE_STREAMS + virtual bool DoCanRead( wxInputStream& stream ) = 0; +#endif // wxUSE_STREAMS + 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"; - }; - -#if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream ); - virtual bool SaveFile( wxImage *image, wxOutputStream& stream ); -#endif -}; -#endif //----------------------------------------------------------------------------- -// wxBMPHandler +// wxImage //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBMPHandler: public wxImageHandler -{ - DECLARE_DYNAMIC_CLASS(wxBMPHandler) - -public: - - inline wxBMPHandler() - { - m_name = "BMP file"; - m_extension = "bmp"; - m_type = wxBITMAP_TYPE_BMP; - m_mime = "image/bmp"; - }; - -#if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream ); -#endif -}; - -//----------------------------------------------------------------------------- -// wxGIFHandler -//----------------------------------------------------------------------------- -class WXDLLEXPORT wxGIFHandler : public wxImageHandler +// GRG: Dic/99 +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 { @@ -185,39 +97,44 @@ public: 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, 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 + + // 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 - wxImage Rescale( int width, int height ) { *this = Scale(width, height); } + wxImage& Rescale( int width, int height ) { return *this = Scale(width, height); } - // these routines are slow but safe + // 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 ); + + 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 ); + static bool CanRead( wxInputStream& stream ); + virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY ); virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype ); #endif @@ -235,7 +152,7 @@ public: 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; @@ -252,7 +169,7 @@ public: bool operator == (const wxImage& image) { return m_refData == image.m_refData; } - bool operator != (const wxImage& image) + bool operator != (const wxImage& image) { return m_refData != image.m_refData; } static wxList& GetHandlers() { return sm_handlers; } @@ -267,12 +184,33 @@ public: static void CleanUpHandlers(); static void InitStandardHandlers(); + // GRG: Dic/99 + unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 ); + unsigned long ComputeHistogram( wxHashTable &h ); + + protected: static wxList sm_handlers; - + }; + +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_