harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r793537 - /harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
Date Mon, 13 Jul 2009 10:50:20 GMT
Author: tellison
Date: Mon Jul 13 10:50:20 2009
New Revision: 793537

URL: http://svn.apache.org/viewvc?rev=793537&view=rev
Log:
Apply patch for HARMONY-6256 ([classlib][awt] Incorrect test of transformation type when clipping)

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java?rev=793537&r1=793536&r2=793537&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
Mon Jul 13 10:50:20 2009
@@ -235,8 +235,8 @@
             mra.translate((int)transform.getTranslateX(), (int)transform.getTranslateY());
         } else {
             int type = transform.getType();
-            if(s instanceof Rectangle && (type & (AffineTransform.TYPE_IDENTITY
|
-                AffineTransform.TYPE_TRANSLATION)) != 0){
+            if(s instanceof Rectangle && (type == AffineTransform.TYPE_IDENTITY ||
+                type == AffineTransform.TYPE_TRANSLATION )) {
                     mra = new MultiRectArea((Rectangle)s);
                     if(type == AffineTransform.TYPE_TRANSLATION){
                         mra.translate((int)transform.getTranslateX(), (int)transform.getTranslateY());
@@ -931,8 +931,8 @@
             setTransformedClip(nclip);
         } else {
             int type = transform.getType();
-            if(s instanceof Rectangle && (type & (AffineTransform.TYPE_IDENTITY
|
-                AffineTransform.TYPE_TRANSLATION)) != 0){
+            if(s instanceof Rectangle && (type == AffineTransform.TYPE_IDENTITY ||
+                type == AffineTransform.TYPE_TRANSLATION )) {
                     MultiRectArea nclip = new MultiRectArea((Rectangle)s);
                     if(type == AffineTransform.TYPE_TRANSLATION){
                         nclip.translate((int)transform.getTranslateX(), (int)transform.getTranslateY());



Mime
View raw message