FOP-3032: Embed pdf into afp using unique type
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk@1894759 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/xmlgraphics-commons-svn-trunk.jar b/lib/xmlgraphics-commons-svn-trunk.jar
index 4dae3d0..542966f 100644
--- a/lib/xmlgraphics-commons-svn-trunk.jar
+++ b/lib/xmlgraphics-commons-svn-trunk.jar
Binary files differ
diff --git a/pom.xml b/pom.xml
index d02a889..9328e3b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>org.apache.fop.render.pdf.pdfbox</groupId>
<artifactId>fop-pdf-images</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>PDF image support for Apache FOP</description>
<url>https://xmlgraphics.apache.org/fop/fop-pdf-images.html</url>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2AFP.java b/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2AFP.java
index 90dcce0..f1ec01c 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2AFP.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2AFP.java
@@ -47,6 +47,7 @@
pdDocument = splitter.split(pdDocument).get(0);
ByteArrayOutputStream pdf = new ByteArrayOutputStream();
pdDocument.save(pdf);
+ pdDocument.close();
MimeEnabledImageFlavor imageFlavor = new MimeEnabledImageFlavor(src.getFlavor(), ImagePDF.MIME_PDF);
return new ImageRawStream(src.getInfo(), imageFlavor, new ByteArrayInputStream(pdf.toByteArray()));
}
@@ -56,7 +57,7 @@
}
public ImageFlavor getTargetFlavor() {
- return ImageFlavor.RAW;
+ return ImageFlavor.RAW_PDF;
}
public int getConversionPenalty() {
