Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 12424 invoked from network); 6 Dec 2006 21:25:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Dec 2006 21:25:11 -0000 Received: (qmail 92241 invoked by uid 500); 6 Dec 2006 21:25:19 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 92142 invoked by uid 500); 6 Dec 2006 21:25:19 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 92129 invoked by uid 99); 6 Dec 2006 21:25:19 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Dec 2006 13:25:19 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Dec 2006 13:25:09 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id EB4DB1A9846; Wed, 6 Dec 2006 13:24:27 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r483238 - in /harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows: GDIBlitter.cpp WinGDIPGraphics2D.cpp Date: Wed, 06 Dec 2006 21:24:27 -0000 To: commits@harmony.apache.org From: apetrenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061206212427.EB4DB1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apetrenko Date: Wed Dec 6 13:24:26 2006 New Revision: 483238 URL: http://svn.apache.org/viewvc?view=rev&rev=483238 Log: Optimizing compiler warnings are fixed Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp?view=diff&rev=483238&r1=483237&r2=483238 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp (original) +++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/GDIBlitter.cpp Wed Dec 6 13:24:26 2006 @@ -50,7 +50,7 @@ SURFACE_STRUCTURE *srcSurf = (SURFACE_STRUCTURE *)srcSurfStruct; SURFACE_STRUCTURE *dstSurf = (SURFACE_STRUCTURE *)dstSurfStruct; - srcSurf->invalidated = invalidated; + srcSurf->invalidated = invalidated != 0; HDC tmpDC = CreateCompatibleDC(dstSurf->gi->hdc); int w = srcSurf->width; int h = srcSurf->height; @@ -195,7 +195,7 @@ BLITSTRUCT blitStruct; memset(&blitStruct, 0, sizeof(BLITSTRUCT)); - srcSurf->invalidated = invalidated; + srcSurf->invalidated = invalidated != 0; if(!initBlitData(srcSurf, env, srcData, compType, srca, &blitStruct)) return; XFORM currentTransform, transform; @@ -473,7 +473,7 @@ if(!srcBmp){ return false; } - updateCache(srcSurf, env, srcData, alphaPre); + updateCache(srcSurf, env, srcData, alphaPre != 0); SetDIBits(srcSurf->srcDC, srcSurf->bitmap, 0, srcSurf->height, srcSurf->bmpData, (BITMAPINFO *)&srcSurf->bmpInfo, DIB_RGB_COLORS); return true; } Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp?view=diff&rev=483238&r1=483237&r2=483238 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp (original) +++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/WinGDIPGraphics2D.cpp Wed Dec 6 13:24:26 2006 @@ -521,7 +521,7 @@ gi->graphics->SetTransform(gi->matrix); if (x1 == x2 && y1 == y2) - gi->graphics->DrawLine(gi->pen, ((REAL)x1)-0.1, (REAL)y1, ((REAL)x2)+0.1, (REAL)y2); + gi->graphics->DrawLine(gi->pen, ((REAL)x1)-0.1f, (REAL)y1, ((REAL)x2)+0.1f, (REAL)y2); else gi->graphics->DrawLine(gi->pen, x1, y1, x2, y2);