Added mono bitmap to image conversion.
Added wxImage::Replace() (replaces one colour with another).
Toolbar tips no longer eats ana new colour. This might prevent
the wrong colour behaviour reported from some 8-bit visuals.
Minor fixes and test code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
@@ -37,48 +37,46 @@ class WXDLLEXPORT wxImage;
|
||||
|
||||
class WXDLLEXPORT wxImageHandler: public wxObject
|
||||
{
|
||||
DECLARE_CLASS(wxImageHandler)
|
||||
|
||||
public:
|
||||
wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
|
||||
wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
|
||||
|
||||
#if wxUSE_STREAMS
|
||||
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
|
||||
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
|
||||
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
|
||||
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
|
||||
|
||||
virtual int GetImageCount( wxInputStream& stream );
|
||||
virtual int GetImageCount( wxInputStream& stream );
|
||||
|
||||
bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
|
||||
bool CanRead( const wxString& name );
|
||||
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; }
|
||||
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;
|
||||
virtual bool DoCanRead( wxInputStream& stream ) = 0;
|
||||
#endif // wxUSE_STREAMS
|
||||
|
||||
wxString m_name;
|
||||
wxString m_extension;
|
||||
wxString m_mime;
|
||||
long m_type;
|
||||
wxString m_name;
|
||||
wxString m_extension;
|
||||
wxString m_mime;
|
||||
long m_type;
|
||||
|
||||
private:
|
||||
DECLARE_CLASS(wxImageHandler)
|
||||
};
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxImage
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
// GRG: Dic/99
|
||||
class WXDLLEXPORT wxHNode
|
||||
{
|
||||
public:
|
||||
@@ -86,113 +84,112 @@ public:
|
||||
unsigned long value;
|
||||
};
|
||||
|
||||
|
||||
class WXDLLEXPORT wxImage: public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxImage)
|
||||
|
||||
friend class WXDLLEXPORT wxImageHandler;
|
||||
|
||||
public:
|
||||
wxImage();
|
||||
wxImage( int width, int height );
|
||||
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();
|
||||
wxImage( int width, int height );
|
||||
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 );
|
||||
|
||||
wxImage( const wxImage& image );
|
||||
wxImage( const wxImage* image );
|
||||
// these functions get implemented in /src/(platform)/bitmap.cpp
|
||||
wxImage( const wxBitmap &bitmap );
|
||||
operator wxBitmap() const { return ConvertToBitmap(); }
|
||||
wxBitmap ConvertToBitmap() const;
|
||||
|
||||
// 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();
|
||||
|
||||
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 GetSubImage( const wxRect& ) const;
|
||||
// return the new image with size width*height
|
||||
wxImage Scale( int width, int height ) 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 ) { return *this = Scale(width, height); }
|
||||
|
||||
// rescales the image in place
|
||||
wxImage& Rescale( int width, int height ) { return *this = Scale(width, height); }
|
||||
// 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 );
|
||||
|
||||
// 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 );
|
||||
// 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 );
|
||||
|
||||
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 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
|
||||
static bool CanRead( wxInputStream& stream );
|
||||
virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
|
||||
virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype );
|
||||
static bool CanRead( wxInputStream& stream );
|
||||
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 );
|
||||
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 );
|
||||
virtual bool SaveFile( wxOutputStream& stream, int type );
|
||||
virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype );
|
||||
#endif
|
||||
|
||||
bool Ok() const;
|
||||
int GetWidth() const;
|
||||
int GetHeight() const;
|
||||
bool Ok() const;
|
||||
int GetWidth() const;
|
||||
int GetHeight() const;
|
||||
|
||||
char unsigned *GetData() const;
|
||||
void SetData( char unsigned *data );
|
||||
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;
|
||||
unsigned char GetMaskBlue() const;
|
||||
void SetMask( bool mask = TRUE );
|
||||
bool HasMask() const;
|
||||
void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
|
||||
unsigned char GetMaskRed() const;
|
||||
unsigned char GetMaskGreen() const;
|
||||
unsigned char GetMaskBlue() const;
|
||||
void SetMask( bool mask = TRUE );
|
||||
bool HasMask() const;
|
||||
|
||||
wxImage& operator = (const wxImage& image)
|
||||
{
|
||||
if ( (*this) != image )
|
||||
Ref(image);
|
||||
return *this;
|
||||
}
|
||||
unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 );
|
||||
unsigned long ComputeHistogram( wxHashTable &h );
|
||||
|
||||
bool operator == (const wxImage& image)
|
||||
{ return m_refData == image.m_refData; }
|
||||
bool operator != (const wxImage& image)
|
||||
{ return m_refData != image.m_refData; }
|
||||
wxImage& operator = (const wxImage& image)
|
||||
{
|
||||
if ( (*this) != image )
|
||||
Ref(image);
|
||||
return *this;
|
||||
}
|
||||
|
||||
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 );
|
||||
bool operator == (const wxImage& image)
|
||||
{ return m_refData == image.m_refData; }
|
||||
bool operator != (const wxImage& image)
|
||||
{ return m_refData != image.m_refData; }
|
||||
|
||||
static void CleanUpHandlers();
|
||||
static void InitStandardHandlers();
|
||||
|
||||
// GRG: Dic/99
|
||||
unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 );
|
||||
unsigned long ComputeHistogram( wxHashTable &h );
|
||||
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;
|
||||
|
||||
static wxList sm_handlers;
|
||||
private:
|
||||
friend class WXDLLEXPORT wxImageHandler;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxImage)
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user