You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2023/05/07 15:24:19 UTC

svn commit: r1909662 - in /pdfbox/trunk/examples/src: main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java test/java/org/apache/pdfbox/examples/rendering/ test/java/org/apache/pdfbox/examples/rendering/TestCustomPageDrawer.java

Author: tilman
Date: Sun May  7 15:24:19 2023
New Revision: 1909662

URL: http://svn.apache.org/viewvc?rev=1909662&view=rev
Log:
PDFBOX-5596: avoid toRGB() call for PDPattern; change output directory; add test for more code coverage

Added:
    pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/rendering/
    pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/rendering/TestCustomPageDrawer.java   (with props)
Modified:
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java?rev=1909662&r1=1909661&r2=1909662&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/rendering/CustomPageDrawer.java Sun May  7 15:24:19 2023
@@ -35,6 +35,7 @@ import org.apache.pdfbox.contentstream.P
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
+import org.apache.pdfbox.pdmodel.graphics.color.PDPattern;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.rendering.PageDrawer;
@@ -62,7 +63,7 @@ public class CustomPageDrawer
         {
             PDFRenderer renderer = new MyPDFRenderer(doc);
             BufferedImage image = renderer.renderImage(0);
-            ImageIO.write(image, "PNG", new File("custom-render.png"));
+            ImageIO.write(image, "PNG", new File("target","custom-render.png"));
         }
     }
 
@@ -100,7 +101,8 @@ public class CustomPageDrawer
         protected Paint getPaint(PDColor color) throws IOException
         {
             // if this is the non-stroking color, find red, ignoring alpha channel
-            if (getGraphicsState().getNonStrokingColor() == color &&
+            if (!(color.getColorSpace() instanceof PDPattern) &&
+                getGraphicsState().getNonStrokingColor() == color &&
                 color.toRGB() == (Color.RED.getRGB() & 0x00FFFFFF))
             {
                 // replace it with blue

Added: pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/rendering/TestCustomPageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/rendering/TestCustomPageDrawer.java?rev=1909662&view=auto
==============================================================================
--- pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/rendering/TestCustomPageDrawer.java (added)
+++ pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/rendering/TestCustomPageDrawer.java Sun May  7 15:24:19 2023
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+package org.apache.pdfbox.examples.rendering;
+
+import java.awt.image.BufferedImage;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ *
+ * @author Tilman Hausherr
+ */
+class TestCustomPageDrawer
+{
+    @Test
+    void testCreateGradientShading() throws IOException
+    {
+        CustomPageDrawer.main(new String[]{});
+        BufferedImage bim = ImageIO.read(new File("target","custom-render.png"));
+        Assertions.assertNotNull(bim);
+    }
+}

Propchange: pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/rendering/TestCustomPageDrawer.java
------------------------------------------------------------------------------
    svn:eol-style = native