Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 30115 invoked from network); 5 Nov 2006 10:31:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Nov 2006 10:31:57 -0000 Received: (qmail 52003 invoked by uid 500); 5 Nov 2006 10:32:09 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 51902 invoked by uid 500); 5 Nov 2006 10:32:08 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 51891 invoked by uid 99); 5 Nov 2006 10:32:08 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Nov 2006 02:32:08 -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; Sun, 05 Nov 2006 02:31:56 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id EEF3A1A9846; Sun, 5 Nov 2006 02:31:30 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r471392 - in /incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java: linux/org/apache/harmony/awt/gl/linux/XBlitter.java windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java Date: Sun, 05 Nov 2006 10:31:30 -0000 To: harmony-commits@incubator.apache.org From: apetrenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061105103130.EEF3A1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: apetrenko Date: Sun Nov 5 02:31:30 2006 New Revision: 471392 URL: http://svn.apache.org/viewvc?view=rev&rev=471392 Log: Patch for HARMONY-1652 "[classlib][awt] Graphics doesn't draw image if clip is set to null" Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XBlitter.java incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XBlitter.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XBlitter.java?view=diff&rev=471392&r1=471391&r2=471392 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XBlitter.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XBlitter.java Sun Nov 5 02:31:30 2006 @@ -248,7 +248,11 @@ int width, int height, Composite comp, Color bgcolor, MultiRectArea clip ) { - clip = new MultiRectArea(clip); + if (clip == null) { + clip = new MultiRectArea(new Rectangle(dstX, dstY, width, height)); + } else { + clip = new MultiRectArea(clip); + } // XXX - todo - need to do smth with bgcolor ColorModel srcCM = srcSurf.getColorModel(); XSurface xDstSurf = (XSurface) dstSurf; Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java?view=diff&rev=471392&r1=471391&r2=471392 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java Sun Nov 5 02:31:30 2006 @@ -89,17 +89,11 @@ } long dstSurfStruct = dstSurf.getSurfaceDataPtr(); long srcSurfStruct = srcSurf.getSurfaceDataPtr(); - int clipRects[]; + int clipRects[] = null; + int numVertex = 0; if(clip != null){ clipRects = clip.rect; - }else{ - clipRects = new int[]{5, 0, 0, dstSurf.getWidth(), - dstSurf.getHeight()}; - } - - int numVertex = clipRects[0] - 1; - if(numVertex == 0) { - return; + numVertex = clipRects[0] - 1; } if(comp instanceof AlphaComposite){