From commits-return-14073-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Fri Jan 11 11:33:58 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 81583180648 for ; Fri, 11 Jan 2019 11:33:57 +0100 (CET) Received: (qmail 47352 invoked by uid 500); 11 Jan 2019 10:33:56 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 47343 invoked by uid 99); 11 Jan 2019 10:33:56 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Jan 2019 10:33:56 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 0F2EB3A01BF for ; Fri, 11 Jan 2019 10:33:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1851026 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Date: Fri, 11 Jan 2019 10:33:55 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190111103356.0F2EB3A01BF@svn01-us-west.apache.org> Author: tilman Date: Fri Jan 11 10:33:55 2019 New Revision: 1851026 URL: http://svn.apache.org/viewvc?rev=1851026&view=rev Log: PDFBOX-4399: refactor Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1851026&r1=1851025&r2=1851026&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Fri Jan 11 10:33:55 2019 @@ -725,25 +725,23 @@ public class PageDrawer extends PDFGraph RenderingHints.VALUE_ANTIALIAS_OFF); } + Shape shape; if (!(graphics.getPaint() instanceof Color)) { // apply clip to path to avoid oversized device bounds in shading contexts (PDFBOX-2901) Area area = new Area(linePath); area.intersect(new Area(graphics.getClip())); intersectShadingBBox(getGraphicsState().getNonStrokingColor(), area); - if (isContentRendered()) - { - graphics.fill(area); - } + shape = area; } else { - if (isContentRendered()) - { - graphics.fill(linePath); - } + shape = linePath; + } + if (isContentRendered()) + { + graphics.fill(shape); } - //TODO refactor fill linePath.reset(); @@ -1204,23 +1202,20 @@ public class PageDrawer extends PDFGraph // get the transformed BBox and intersect with current clipping path // need to do it here and not in shading getRaster() because it may have been rotated PDRectangle bbox = shading.getBBox(); + Area area; if (bbox != null) { - Area bboxArea = new Area(bbox.transform(ctm)); - bboxArea.intersect(getGraphicsState().getCurrentClippingPath()); - if (isContentRendered()) - { - graphics.fill(bboxArea); - } + area = new Area(bbox.transform(ctm)); + area.intersect(getGraphicsState().getCurrentClippingPath()); } else { - if (isContentRendered()) - { - graphics.fill(getGraphicsState().getCurrentClippingPath()); - } + area = getGraphicsState().getCurrentClippingPath(); + } + if (isContentRendered()) + { + graphics.fill(area); } - //TODO refactor fill } @Override