You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ss...@apache.org on 2014/08/22 15:04:33 UTC
svn commit: r1619791 - in /xmlgraphics/fop-pdf-images/trunk: build.xml
src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
Author: ssteiner
Date: Fri Aug 22 13:04:32 2014
New Revision: 1619791
URL: http://svn.apache.org/r1619791
Log:
FOP-2406: Test merge resources
Modified:
xmlgraphics/fop-pdf-images/trunk/build.xml
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
Modified: xmlgraphics/fop-pdf-images/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/build.xml?rev=1619791&r1=1619790&r2=1619791&view=diff
==============================================================================
--- xmlgraphics/fop-pdf-images/trunk/build.xml (original)
+++ xmlgraphics/fop-pdf-images/trunk/build.xml Fri Aug 22 13:04:32 2014
@@ -153,7 +153,7 @@
<xml destfile="${jacoco.report.dir}/report.xml"/>
<check>
<rule element="PACKAGE">
- <limit counter="LINE" value="COVEREDRATIO" minimum="0.76"/>
+ <limit counter="LINE" value="COVEREDRATIO" minimum="0.8"/>
</rule>
</check>
</jacoco:report>
Modified: xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java?rev=1619791&r1=1619790&r2=1619791&view=diff
==============================================================================
--- xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java (original)
+++ xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java Fri Aug 22 13:04:32 2014
@@ -67,7 +67,10 @@ public abstract class AbstractPDFBoxHand
protected String createStreamForPDF(ImagePDF image, PDFPage targetPage, FOUserAgent userAgent,
AffineTransform at, FontInfo fontinfo, Rectangle pos) throws IOException {
- EventBroadcaster eventBroadcaster = userAgent.getEventBroadcaster();
+ EventBroadcaster eventBroadcaster = null;
+ if (userAgent != null) {
+ eventBroadcaster = userAgent.getEventBroadcaster();
+ }
String originalImageUri = image.getInfo().getOriginalURI();
final int selectedPage = ImageUtil.needPageIndexFromURI(originalImageUri);
Modified: xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java?rev=1619791&r1=1619790&r2=1619791&view=diff
==============================================================================
--- xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java (original)
+++ xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java Fri Aug 22 13:04:32 2014
@@ -20,9 +20,11 @@ package org.apache.fop.render.pdf;
import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Set;
@@ -30,6 +32,9 @@ import java.util.TreeSet;
import javax.imageio.ImageIO;
+import org.apache.fop.pdf.PDFGState;
+import org.apache.fop.render.pdf.pdfbox.ImagePDF;
+import org.apache.fop.render.pdf.pdfbox.PDFBoxImageHandler;
import org.junit.Test;
import org.apache.commons.io.IOUtils;
@@ -79,6 +84,7 @@ public class PDFBoxAdapterTestCase {
private static final String Type1Subset3 = "test/resources/t1subset3.pdf";
private static final String Type1Subset4 = "test/resources/t1subset4.pdf";
private static final String ROTATE = "test/resources/rotate.pdf";
+ private static final String SHADING = "test/resources/shading.pdf";
private PDFBoxAdapter getPDFBoxAdapter() {
PDFDocument doc = new PDFDocument("");
@@ -291,4 +297,23 @@ public class PDFBoxAdapterTestCase {
Assert.assertEquals(imageInfo.getMimeType(), "application/pdf");
}
+
+ @Test
+ public void testPDFBoxImageHandler() throws Exception {
+ ImageInfo imgi = new ImageInfo("a", "b");
+ PDDocument doc = PDDocument.load(SHADING);
+ ImagePDF img = new ImagePDF(imgi, doc);
+ PDFDocument pdfdoc = new PDFDocument("");
+ pdfpage.setDocument(pdfdoc);
+ PDFGState g = new PDFGState();
+ pdfdoc.assignObjectNumber(g);
+ pdfpage.addGState(g);
+ PDFContentGenerator con = new PDFContentGenerator(pdfdoc, null, null);
+ PDFRenderingContext c = new PDFRenderingContext(null, con, pdfpage, null);
+ new PDFBoxImageHandler().handleImage(c, img, new Rectangle());
+ PDFResources res = c.getPage().getPDFResources();
+ OutputStream bos = new ByteArrayOutputStream();
+ res.output(bos);
+ Assert.assertTrue(bos.toString().contains("/ExtGState << /GS5"));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org