X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..f924129679e25bdc0bb8d4accf47bc420d4b802d:/include/wx/image.h diff --git a/include/wx/image.h b/include/wx/image.h index dd8a5e9754..21d0f14710 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -19,15 +19,26 @@ #include "wx/string.h" #include "wx/gdicmn.h" +#if wxUSE_STREAMS +#include "wx/stream.h" +#endif + //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- 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 //----------------------------------------------------------------------------- @@ -39,19 +50,24 @@ class WXDLLEXPORT wxImageHandler: public wxObject 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 ); +#if wxUSE_STREAMS + virtual bool LoadFile( wxImage *image, wxInputStream& stream ); + virtual bool SaveFile( wxImage *image, wxOutputStream& stream ); +#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; } + protected: wxString m_name; wxString m_extension; + wxString m_mime; long m_type; }; @@ -60,22 +76,52 @@ protected: // 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; - }; + 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 - virtual bool LoadFile( wxImage *image, const wxString& name ); - virtual bool SaveFile( wxImage *image, const wxString& name ); }; +#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"; + }; + + virtual bool LoadFile( wxImage *image, wxInputStream& stream ); + virtual bool SaveFile( wxImage *image, wxOutputStream& stream ); +}; +#endif //----------------------------------------------------------------------------- // wxBMPHandler @@ -87,15 +133,27 @@ class WXDLLEXPORT wxBMPHandler: public wxImageHandler public: - inline wxBMPHandler() - { - m_name = "BMP file"; - m_extension = "bmp"; - m_type = wxBITMAP_TYPE_BMP; - }; + inline wxBMPHandler() + { + m_name = "BMP file"; + m_extension = "bmp"; + m_type = wxBITMAP_TYPE_BMP; + m_mime = "image/bmp"; + }; - virtual bool LoadFile( wxImage *image, const wxString& name ); +#if wxUSE_STREAMS + virtual bool LoadFile( wxImage *image, wxInputStream& stream ); +#endif }; + +//----------------------------------------------------------------------------- +// wxGIFHandler +//----------------------------------------------------------------------------- + +/* why an extra headers for GIF, RR */ + +#include "wx/imaggif.h" + //----------------------------------------------------------------------------- // wxImage //----------------------------------------------------------------------------- @@ -111,15 +169,43 @@ 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, 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 ); + wxBitmap ConvertToBitmap() const; void Create( int width, int height ); void Destroy(); + wxImage Scale( int width, int 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_PNG ); + virtual bool LoadFile( const wxString& name, const wxString& mimetype ); + +#if wxUSE_STREAMS + virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG ); + 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; @@ -135,9 +221,13 @@ public: 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) + 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; } @@ -149,8 +239,10 @@ public: 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: @@ -160,3 +252,4 @@ protected: #endif // _WX_IMAGE_H_ +