From e9b64c5ea81918a44c03adfe90984f8a3f480619 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 7 Mar 2005 17:39:22 +0000 Subject: [PATCH] Warning fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/image.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/image.cpp b/src/common/image.cpp index 3f90f3238a..bf0c2ee8cf 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -177,7 +177,7 @@ bool wxImage::Create( const char** xpmData ) { #if wxUSE_XPM UnRef(); - + wxXPMDecoder decoder; (*this) = decoder.ReadData(xpmData); return Ok(); @@ -425,7 +425,7 @@ wxImage wxImage::Scale( int width, int height ) const unsigned char *target_data = data; unsigned char *source_alpha = 0 ; unsigned char *target_alpha = 0 ; - + if (M_IMGDATA->m_hasMask) { 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_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ; - + long x = 0; for ( long i = 0; i < width; i++ ) { @@ -603,7 +603,7 @@ wxImage wxImage::GetSubImage( const wxRect &rect ) const 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 { wxImage image; @@ -810,8 +810,8 @@ void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, uns } else { - wxCHECK_RET( imageRect.Inside(rect.GetTopLeft()) && - imageRect.Inside(rect.GetBottomRight()), + wxCHECK_RET( imageRect.Inside(rect.GetTopLeft()) && + imageRect.Inside(rect.GetBottomRight()), 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, y2 = rect.GetBottom() + 1; - unsigned char *data = NULL; + unsigned char *data wxDUMMY_INITIALIZE(NULL); int x, y, width = GetWidth(); for (y = y1; y < y2; y++) { -- 2.45.2