Author: ssteiner
Date: Tue Aug 19 15:24:15 2014
New Revision: 1618885
URL: http://svn.apache.org/r1618885
Log:
FOP-2406: Error when image next to pdf
Modified:
xmlgraphics/fop-pdf-images/trunk/lib/fop.jar
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
Modified: xmlgraphics/fop-pdf-images/trunk/lib/fop.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/lib/fop.jar?rev=1618885&r1=1618884&r2=1618885&view=diff
==============================================================================
Binary files - no diff available.
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=1618885&r1=1618884&r2=1618885&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
Tue Aug 19 15:24:15 2014
@@ -107,6 +107,7 @@ public abstract class AbstractPDFBoxHand
if (targetPage.getPDFResources().getParentResources() == null) {
PDFResources res = pdfDoc.getFactory().makeResources();
res.setParentResources(pdfDoc.getResources());
+ res.addContext(targetPage);
targetPage.put("Resources", res);
}
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java?rev=1618885&r1=1618884&r2=1618885&view=diff
==============================================================================
---
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
(original)
+++
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
Tue Aug 19 15:24:15 2014
@@ -1215,6 +1215,8 @@ public class PDFBoxAdapter {
s.append("<<");
readPDFArguments(op, dictArgs);
s.append(">>");
+ } else if (c instanceof COSBoolean) {
+ s.append(((COSBoolean) c).getValue());
} else {
throw new IOException(c + " not supported");
}
@@ -1382,6 +1384,9 @@ public class PDFBoxAdapter {
PDResources sourcePageResources = page.findResources();
PDFDictionary pageResources = null;
PDStream pdStream = page.getContents();
+ if (pdStream == null) {
+ return "";
+ }
COSDictionary fonts =
(COSDictionary)sourcePageResources.getCOSDictionary().getDictionaryObject(COSName.FONT);
COSDictionary fontsBackup = null;
String uniqueName = Integer.toString(key.hashCode());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
