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

wxImage::ConvertToMono wasn't const - fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-04-06 22:15:34 +00:00
parent 58d5dfc168
commit f515c25a2c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/image.h
View File

@@ -104,7 +104,7 @@ public:
operator wxBitmap() const { return ConvertToBitmap(); } operator wxBitmap() const { return ConvertToBitmap(); }
wxBitmap ConvertToBitmap() const; wxBitmap ConvertToBitmap() const;
#ifdef __WXGTK__ #ifdef __WXGTK__
wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ); wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
#endif #endif
#endif #endif
@@ -142,7 +142,7 @@ public:
unsigned char r2, unsigned char g2, unsigned char b2 ); unsigned char r2, unsigned char g2, unsigned char b2 );
// convert to monochrome image (<r,g,b> will be replaced by white, everything else by black) // convert to monochrome image (<r,g,b> will be replaced by white, everything else by black)
wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ); wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const;
// these routines are slow but safe // these routines are slow but safe
void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b ); void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );

4
src/common/image.cpp
View File

@@ -464,7 +464,7 @@ void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
} }
} }
wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const
{ {
wxImage image; wxImage image;
@@ -1084,7 +1084,7 @@ bool wxImageHandler::CanRead( const wxString& name )
#if wxUSE_GUI #if wxUSE_GUI
#ifdef __WXGTK__ #ifdef __WXGTK__
wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const
{ {
wxImage mono = this->ConvertToMono( red, green, blue ); wxImage mono = this->ConvertToMono( red, green, blue );
wxBitmap bitmap( mono, 1 ); wxBitmap bitmap( mono, 1 );