X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56b9c74101566aa241d1846a148d3a01980b7431..272cd5dddb860829b6a0beb004570a6a1c0a6ccc:/include/wx/image.h diff --git a/include/wx/image.h b/include/wx/image.h index 325c7a9a53..e4d78863ab 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 //----------------------------------------------------------------------------- @@ -35,10 +36,17 @@ class WXDLLEXPORT wxPNGHandler; 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 wxBitmap; - //----------------------------------------------------------------------------- // wxImageHandler //----------------------------------------------------------------------------- @@ -46,27 +54,33 @@ class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxImageHandler: public wxObject { DECLARE_DYNAMIC_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 ); + 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 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; } + protected: wxString m_name; wxString m_extension; + wxString m_mime; long m_type; - + }; //----------------------------------------------------------------------------- @@ -77,7 +91,7 @@ protected: class WXDLLEXPORT wxPNGHandler: public wxImageHandler { DECLARE_DYNAMIC_CLASS(wxPNGHandler) - + public: inline wxPNGHandler() @@ -85,13 +99,17 @@ public: 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 ); + 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 - }; #endif @@ -99,7 +117,7 @@ public: // wxJPEGHandler //----------------------------------------------------------------------------- -#ifdef wxUSE_LIBJPEG +#if wxUSE_LIBJPEG class WXDLLEXPORT wxJPEGHandler: public wxImageHandler { DECLARE_DYNAMIC_CLASS(wxJPEGHandler) @@ -111,10 +129,17 @@ public: 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 ); +#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 }; #endif @@ -125,7 +150,7 @@ public: class WXDLLEXPORT wxBMPHandler: public wxImageHandler { DECLARE_DYNAMIC_CLASS(wxBMPHandler) - + public: inline wxBMPHandler() @@ -133,12 +158,105 @@ public: 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, 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 +}; + +//----------------------------------------------------------------------------- +// 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"; + }; + +#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 +}; +#endif + +//----------------------------------------------------------------------------- +// wxPNMHandler +//----------------------------------------------------------------------------- + +#if wxUSE_PNM +class WXDLLEXPORT wxPNMHandler : public wxImageHandler +{ + DECLARE_DYNAMIC_CLASS(wxPNMHandler) + +public: + + inline wxPNMHandler() + { + m_name = "PNM file"; + m_extension = "pnm"; + m_type = wxBITMAP_TYPE_PNM; + m_mime = "image/pnm"; }; #if wxUSE_STREAMS - virtual bool LoadFile( wxImage *image, wxInputStream& stream ); + 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 }; +#endif + +//----------------------------------------------------------------------------- +// wxPCXHandler +//----------------------------------------------------------------------------- + +#if wxUSE_PCX +class WXDLLEXPORT wxPCXHandler : public wxImageHandler +{ + DECLARE_DYNAMIC_CLASS(wxPCXHandler) + +public: + + inline wxPCXHandler() + { + m_name = "PCX file"; + m_extension = "pcx"; + m_type = wxBITMAP_TYPE_PCX; + m_mime = "image/pcx"; + }; + +#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 //----------------------------------------------------------------------------- // wxImage @@ -154,37 +272,51 @@ 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(); - - wxImage Scale( int width, int height ); - - // these routines are slow but safe + + // 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_PNG ); + + 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 ); + 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; @@ -193,7 +325,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; @@ -201,33 +333,38 @@ public: void SetMask( bool mask = TRUE ); bool HasMask() const; - inline wxImage& operator = (const wxImage& image) - { if ((*this) == image) - return (*this); + wxImage& operator = (const wxImage& image) + { + if ( (*this) != image ) Ref(image); - return *this; } + return *this; + } - inline bool operator == (const wxImage& image) + bool operator == (const wxImage& image) { return m_refData == image.m_refData; } - inline bool operator != (const wxImage& image) + bool operator != (const wxImage& image) { return m_refData != image.m_refData; } - static inline wxList& GetHandlers() { return sm_handlers; } + 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; - + }; +extern void wxInitAllImageHandlers(); + #endif // _WX_IMAGE_H_ +