From e35d07b9d0e3b68e7736632c6341935ceb8859b1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 12 Feb 2006 13:08:37 +0000 Subject: [PATCH] compilation fix for VC8 (see patch 1429985) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dcbase.cpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 3326bbda29..782f1d7a30 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -788,12 +788,6 @@ void wxDCBase::GradientFillConcentric(const wxRect& rect, wxUint8 nR, nG, nB; - //offsets of the current pixel - wxInt32 x, y; - - //Color difference - wxInt32 nGradient; - //Radius wxInt32 cx = rect.GetWidth() / 2; wxInt32 cy = rect.GetHeight() / 2; @@ -807,19 +801,16 @@ void wxDCBase::GradientFillConcentric(const wxRect& rect, wxInt32 nCircleOffX = circleCenter.x - (rect.GetWidth() / 2); wxInt32 nCircleOffY = circleCenter.y - (rect.GetHeight() / 2); - for (x = 0; x < rect.GetWidth(); x++) + for ( wxInt32 x = 0; x < rect.GetWidth(); x++ ) { - for (y = 0; y < rect.GetHeight(); y++) + for ( wxInt32 y = 0; y < rect.GetHeight(); y++ ) { //get color difference - nGradient = ( - (nRadius - - (wxInt32)sqrt( - pow(x - cx - nCircleOffX, 2) + - pow(y - cy - nCircleOffY, 2) - ) - ) * 100 - ) / nRadius; + wxInt32 nGradient = ((nRadius - + (wxInt32)sqrt( + pow((double)(x - cx - nCircleOffX), 2) + + pow((double)(y - cy - nCircleOffY), 2) + )) * 100) / nRadius; //normalize Gradient if (nGradient < 0 ) -- 2.45.2