| commit | 4801f67fa078605d3f72f9ddead6e92239ff4e64 | [log] [tgz] |
|---|---|---|
| author | Simon Steiner <ssteiner@apache.org> | Tue Aug 19 15:24:15 2014 +0000 |
| committer | Simon Steiner <ssteiner@apache.org> | Tue Aug 19 15:24:15 2014 +0000 |
| tree | f2b71db012ec3267d8ada1385a793c46f2f44808 | |
| parent | acbcb57a77f926c8be0a9098b4bad65ee9f66ef3 [diff] |
FOP-2406: Error when image next to pdf git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk@1618885 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/fop.jar b/lib/fop.jar index bb2e71f..7398768 100644 --- a/lib/fop.jar +++ b/lib/fop.jar Binary files differ
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java b/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java index 076aa4f..cbb5930 100644 --- a/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java +++ b/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
@@ -107,6 +107,7 @@ if (targetPage.getPDFResources().getParentResources() == null) { PDFResources res = pdfDoc.getFactory().makeResources(); res.setParentResources(pdfDoc.getResources()); + res.addContext(targetPage); targetPage.put("Resources", res); }
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java b/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java index cf4596b..725b468 100644 --- a/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java +++ b/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxAdapter.java
@@ -1215,6 +1215,8 @@ 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 @@ 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());