#include "wx/object.h"
#include "wx/string.h"
#include "wx/gdicmn.h"
+#include "wx/stream.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxImageHandler;
+#ifdef wxUSE_LIBPNG
class WXDLLEXPORT wxPNGHandler;
+#endif
class WXDLLEXPORT wxBMPHandler;
class WXDLLEXPORT wxImage;
+class WXDLLEXPORT wxBitmap;
+
//-----------------------------------------------------------------------------
// wxImageHandler
//-----------------------------------------------------------------------------
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 );
+ virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+ virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
inline void SetName(const wxString& name) { m_name = name; }
inline void SetExtension(const wxString& ext) { m_extension = ext; }
// wxPNGHandler
//-----------------------------------------------------------------------------
+#ifdef 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;
+ };
- virtual bool LoadFile( wxImage *image, const wxString& name );
- virtual bool SaveFile( wxImage *image, const wxString& name );
+ virtual bool LoadFile( wxImage *image, wxInputStream& stream );
+ virtual bool SaveFile( wxImage *image, wxOutputStream& stream );
};
+#endif
//-----------------------------------------------------------------------------
// wxBMPHandler
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;
+ };
- virtual bool LoadFile( wxImage *image, const wxString& name );
+ virtual bool LoadFile( wxImage *image, wxInputStream& stream );
};
+
//-----------------------------------------------------------------------------
// wxImage
//-----------------------------------------------------------------------------
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 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( wxInputStream& stream, long type = wxBITMAP_TYPE_PNG );
virtual bool SaveFile( const wxString& name, int type );
+ virtual bool SaveFile( wxOutputStream& stream, int type );
bool Ok() const;
int GetWidth() const;
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; }
static wxImageHandler *FindHandler( long imageType );
static void CleanUpHandlers();
+ static void InitStandardHandlers();
protected: