From commits-return-14147-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Wed Jan 30 16:24:23 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 AE779180652 for ; Wed, 30 Jan 2019 17:24:22 +0100 (CET) Received: (qmail 50950 invoked by uid 500); 30 Jan 2019 16:24:21 -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 50941 invoked by uid 99); 30 Jan 2019 16:24:21 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jan 2019 16:24:21 +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 2495F3A0100 for ; Wed, 30 Jan 2019 16:24:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1852535 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering: PDFRenderer.java PageDrawer.java Date: Wed, 30 Jan 2019 16:24:21 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190130162421.2495F3A0100@svn01-us-west.apache.org> Author: tilman Date: Wed Jan 30 16:24:20 2019 New Revision: 1852535 URL: http://svn.apache.org/viewvc?rev=1852535&view=rev Log: PDFBOX-4449: remove uneeded cast; apply Math.abs() to scale values Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PDFRenderer.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PDFRenderer.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PDFRenderer.java?rev=1852535&r1=1852534&r2=1852535&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PDFRenderer.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PDFRenderer.java Wed Jan 30 16:24:20 2019 @@ -441,7 +441,7 @@ public class PDFRenderer break; } graphics.translate(translateX, translateY); - graphics.rotate((float) Math.toRadians(rotationAngle)); + graphics.rotate(Math.toRadians(rotationAngle)); } } 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=1852535&r1=1852534&r2=1852535&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 Wed Jan 30 16:24:20 2019 @@ -567,9 +567,9 @@ public class PageDrawer extends PDFGraph private void adjustRectangle(Rectangle2D r) { Matrix m = new Matrix(xform); - double scaleX = m.getScalingFactorX(); - double scaleY = m.getScalingFactorY(); - + double scaleX = Math.abs(m.getScalingFactorX()); + double scaleY = Math.abs(m.getScalingFactorY()); + AffineTransform adjustedTransform = new AffineTransform(xform); adjustedTransform.scale(1.0 / scaleX, 1.0 / scaleY); r.setRect(adjustedTransform.createTransformedShape(r).getBounds2D()); @@ -580,8 +580,8 @@ public class PageDrawer extends PDFGraph { AffineTransform at = new AffineTransform(xform); Matrix m = new Matrix(at); - at.scale(1.0 / m.getScalingFactorX(), 1.0 / m.getScalingFactorY()); - + at.scale(1.0 / Math.abs(m.getScalingFactorX()), 1.0 / Math.abs(m.getScalingFactorY())); + Rectangle originalBounds = new Rectangle(gray.getWidth(), gray.getHeight()); Rectangle2D transformedBounds = at.createTransformedShape(originalBounds).getBounds2D(); at.preConcatenate(AffineTransform.getTranslateInstance(-transformedBounds.getMinX(), @@ -1474,7 +1474,7 @@ public class PageDrawer extends PDFGraph g.transform(dpiTransform); AffineTransform xformOriginal = xform; - xform = AffineTransform.getScaleInstance(m.getScalingFactorX(), m.getScalingFactorY()); + xform = AffineTransform.getScaleInstance(Math.abs(m.getScalingFactorX()), Math.abs(m.getScalingFactorY())); PDRectangle pageSizeOriginal = pageSize; pageSize = new PDRectangle(minX / Math.abs(m.getScalingFactorX()), minY / Math.abs(m.getScalingFactorY()), @@ -1592,8 +1592,8 @@ public class PageDrawer extends PDFGraph AffineTransform dpiTransform = AffineTransform.getScaleInstance(Math.abs(m.getScalingFactorX()), Math.abs(m.getScalingFactorY())); size = dpiTransform.transform(size, size); // Flip y - return new Rectangle2D.Double(minX - pageSize.getLowerLeftX() * m.getScalingFactorX(), - size.getY() - minY - height + pageSize.getLowerLeftY() * m.getScalingFactorY(), + return new Rectangle2D.Double(minX - pageSize.getLowerLeftX() * Math.abs(m.getScalingFactorX()), + size.getY() - minY - height + pageSize.getLowerLeftY() * Math.abs(m.getScalingFactorY()), width, height); } }