harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
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 GMT
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);
     



Mime
View raw message