Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make more wxImage methods const

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-02-08 00:17:25 +00:00
parent d7af2feac4
commit e0a76d8d8a
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/image.h
View File

@@ -168,7 +168,7 @@ public:
// RGB values than <startR,startG,startB> // RGB values than <startR,startG,startB>
bool FindFirstUnusedColour( unsigned char *r, unsigned char *g, unsigned char *b, bool FindFirstUnusedColour( unsigned char *r, unsigned char *g, unsigned char *b,
unsigned char startR = 1, unsigned char startG = 0, unsigned char startR = 1, unsigned char startG = 0,
unsigned char startB = 0 ); unsigned char startB = 0 ) const;
// Set image's mask to the area of 'mask' that has <r,g,b> colour // Set image's mask to the area of 'mask' that has <r,g,b> colour
bool SetMaskFromImage(const wxImage & mask, bool SetMaskFromImage(const wxImage & mask,
unsigned char mr, unsigned char mg, unsigned char mb); unsigned char mr, unsigned char mg, unsigned char mb);
@@ -185,12 +185,12 @@ public:
virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 ); virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 );
#endif #endif
virtual bool SaveFile( const wxString& name, int type ); virtual bool SaveFile( const wxString& name, int type ) const;
virtual bool SaveFile( const wxString& name, const wxString& mimetype ); virtual bool SaveFile( const wxString& name, const wxString& mimetype ) const;
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool SaveFile( wxOutputStream& stream, int type ); virtual bool SaveFile( wxOutputStream& stream, int type ) const;
virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ); virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ) const;
#endif #endif
bool Ok() const; bool Ok() const;
@@ -223,7 +223,7 @@ public:
int GetOptionInt(const wxString& name) const; int GetOptionInt(const wxString& name) const;
bool HasOption(const wxString& name) const; bool HasOption(const wxString& name) const;
unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 ); unsigned long CountColours( unsigned long stopafter = (unsigned long) -1 ) const;
// Computes the histogram of the image and fills a hash table, indexed // Computes the histogram of the image and fills a hash table, indexed
// with integer keys built as 0xRRGGBB, containing wxImageHistogramEntry // with integer keys built as 0xRRGGBB, containing wxImageHistogramEntry
@@ -231,7 +231,7 @@ public:
// with the image colours) and a 'value', which is the number of pixels // with the image colours) and a 'value', which is the number of pixels
// in the image with that colour. // in the image with that colour.
// Returned value: # of entries in the histogram // Returned value: # of entries in the histogram
unsigned long ComputeHistogram( wxImageHistogram &h ); unsigned long ComputeHistogram( wxImageHistogram &h ) const;
wxImage& operator = (const wxImage& image) wxImage& operator = (const wxImage& image)
{ {

18
src/common/image.cpp
View File

@@ -723,7 +723,7 @@ int wxImage::GetHeight() const
bool wxImage::FindFirstUnusedColour( bool wxImage::FindFirstUnusedColour(
unsigned char *r, unsigned char *g, unsigned char *b, unsigned char *r, unsigned char *g, unsigned char *b,
unsigned char startR, unsigned char startG, unsigned char startB) unsigned char startR, unsigned char startG, unsigned char startB) const
{ {
wxImageHistogram histogram; wxImageHistogram histogram;
unsigned long key; unsigned long key;
@@ -930,7 +930,7 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype, int
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
} }
bool wxImage::SaveFile( const wxString& filename, int type ) bool wxImage::SaveFile( const wxString& filename, int type ) const
{ {
#if wxUSE_STREAMS #if wxUSE_STREAMS
wxFileOutputStream stream(filename); wxFileOutputStream stream(filename);
@@ -945,7 +945,7 @@ bool wxImage::SaveFile( const wxString& filename, int type )
return FALSE; return FALSE;
} }
bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype ) const
{ {
#if wxUSE_STREAMS #if wxUSE_STREAMS
wxFileOutputStream stream(filename); wxFileOutputStream stream(filename);
@@ -1089,7 +1089,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
return handler->LoadFile( this, stream, TRUE/*verbose*/, index ); return handler->LoadFile( this, stream, TRUE/*verbose*/, index );
} }
bool wxImage::SaveFile( wxOutputStream& stream, int type ) bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
{ {
wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
@@ -1102,10 +1102,10 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type )
return FALSE; return FALSE;
} }
return handler->SaveFile( this, stream ); return handler->SaveFile( (wxImage*)this, stream );
} }
bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
{ {
wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") ); wxCHECK_MSG( Ok(), FALSE, wxT("invalid image") );
@@ -1118,7 +1118,7 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
return FALSE; return FALSE;
} }
return handler->SaveFile( this, stream ); return handler->SaveFile( (wxImage*)this, stream );
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
@@ -1322,7 +1322,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
// less, in this case it would be invoked as CountColours(256)). Default // less, in this case it would be invoked as CountColours(256)). Default
// value for stopafter is -1 (don't care). // value for stopafter is -1 (don't care).
// //
unsigned long wxImage::CountColours( unsigned long stopafter ) unsigned long wxImage::CountColours( unsigned long stopafter ) const
{ {
wxHashTable h; wxHashTable h;
wxObject dummy; wxObject dummy;
@@ -1352,7 +1352,7 @@ unsigned long wxImage::CountColours( unsigned long stopafter )
} }
unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const
{ {
unsigned char r, g, b; unsigned char r, g, b;
unsigned char *p; unsigned char *p;