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

Warning fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-07 17:39:22 +00:00
parent 9b0b5ba76e
commit e9b64c5ea8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/image.cpp
View File

@@ -177,7 +177,7 @@ bool wxImage::Create( const char** xpmData )
{ {
#if wxUSE_XPM #if wxUSE_XPM
UnRef(); UnRef();
wxXPMDecoder decoder; wxXPMDecoder decoder;
(*this) = decoder.ReadData(xpmData); (*this) = decoder.ReadData(xpmData);
return Ok(); return Ok();
@@ -425,7 +425,7 @@ wxImage wxImage::Scale( int width, int height ) const
unsigned char *target_data = data; unsigned char *target_data = data;
unsigned char *source_alpha = 0 ; unsigned char *source_alpha = 0 ;
unsigned char *target_alpha = 0 ; unsigned char *target_alpha = 0 ;
if (M_IMGDATA->m_hasMask) if (M_IMGDATA->m_hasMask)
{ {
image.SetMaskColour( M_IMGDATA->m_maskRed, image.SetMaskColour( M_IMGDATA->m_maskRed,
@@ -452,7 +452,7 @@ wxImage wxImage::Scale( int width, int height ) const
{ {
unsigned char* src_line = &source_data[(y>>16)*old_width*3]; unsigned char* src_line = &source_data[(y>>16)*old_width*3];
unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ; unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ;
long x = 0; long x = 0;
for ( long i = 0; i < width; i++ ) for ( long i = 0; i < width; i++ )
{ {
@@ -603,7 +603,7 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const
return image; return image;
} }
wxImage wxImage::Size( const wxSize& size, const wxPoint& pos, wxImage wxImage::Size( const wxSize& size, const wxPoint& pos,
int r_, int g_, int b_ ) const int r_, int g_, int b_ ) const
{ {
wxImage image; wxImage image;
@@ -810,8 +810,8 @@ void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, uns
} }
else else
{ {
wxCHECK_RET( imageRect.Inside(rect.GetTopLeft()) && wxCHECK_RET( imageRect.Inside(rect.GetTopLeft()) &&
imageRect.Inside(rect.GetBottomRight()), imageRect.Inside(rect.GetBottomRight()),
wxT("invalid bounding rectangle") ); wxT("invalid bounding rectangle") );
} }
@@ -820,7 +820,7 @@ void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, uns
x2 = rect.GetRight() + 1, x2 = rect.GetRight() + 1,
y2 = rect.GetBottom() + 1; y2 = rect.GetBottom() + 1;
unsigned char *data = NULL; unsigned char *data wxDUMMY_INITIALIZE(NULL);
int x, y, width = GetWidth(); int x, y, width = GetWidth();
for (y = y1; y < y2; y++) for (y = y1; y < y2; y++)
{ {