xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sstei...@apache.org
Subject svn commit: r1835225 - in /xmlgraphics/fop/trunk/fop-core/src: main/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java
Date Fri, 06 Jul 2018 10:05:50 GMT
Author: ssteiner
Date: Fri Jul  6 10:05:49 2018
New Revision: 1835225

URL: http://svn.apache.org/viewvc?rev=1835225&view=rev
Log:
FOP-2802: Java 10 PDF/SVG to Image box not shown

Added:
    xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java
  (with props)
Modified:
    xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java

Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java?rev=1835225&r1=1835224&r2=1835225&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java
(original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImpl.java
Fri Jul  6 10:05:49 2018
@@ -21,11 +21,15 @@ package org.apache.fop.image.loader.bati
 
 import java.awt.Dimension;
 import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.gvt.GraphicsNode;
 
+import org.apache.xmlgraphics.java2d.AbstractGraphics2D;
 import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
 
 /**
@@ -75,6 +79,18 @@ public class Graphics2DImagePainterImpl
         if (sx != 1.0 || sy != 1.0) {
             g2d.scale(sx, sy);
         }
+        normaliseScale(g2d);
+    }
+
+    private void normaliseScale(Graphics2D g2d) {
+        if (!(g2d instanceof AbstractGraphics2D)) {
+            AffineTransform old = g2d.getTransform();
+            double scaleX = BigDecimal.valueOf(old.getScaleX()).setScale(2, RoundingMode.HALF_UP).doubleValue();
+            double scaleY = BigDecimal.valueOf(old.getScaleY()).setScale(2, RoundingMode.HALF_UP).doubleValue();
+            AffineTransform newat = new AffineTransform(scaleX, old.getShearY(), old.getShearX(),
scaleY,
+                    old.getTranslateX(), old.getTranslateY());
+            g2d.setTransform(newat);
+        }
     }
 
     /** {@inheritDoc} */

Added: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java?rev=1835225&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java
(added)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java
Fri Jul  6 10:05:49 2018
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+package org.apache.fop.image.loader.batik;
+
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.gvt.GraphicsNode;
+
+public class Graphics2DImagePainterImplTestCase {
+    @Test
+    public void testScale() {
+        GraphicsNode graphicsNode = mock(GraphicsNode.class);
+        BridgeContext bridgeContext = mock(BridgeContext.class);
+        when(bridgeContext.getDocumentSize()).thenReturn(new Dimension(1010, 1010));
+        BufferedImage image = new BufferedImage(100, 100, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D graphics2D = image.createGraphics();
+        Graphics2DImagePainterImpl graphics2DImagePainter =
+                new Graphics2DImagePainterImpl(graphicsNode, bridgeContext, null);
+        graphics2DImagePainter.paint(graphics2D, new Rectangle(0, 0, 1000, 1000));
+        Assert.assertEquals(graphics2D.getTransform().getScaleX(), 0.99, 0);
+    }
+}

Propchange: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/image/loader/batik/Graphics2DImagePainterImplTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message