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 2016/08/24 18:46:59 UTC
svn commit: r1757567 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Author: tilman
Date: Wed Aug 24 18:46:58 2016
New Revision: 1757567
URL: http://svn.apache.org/viewvc?rev=1757567&view=rev
Log:
PDFBOX-3473: avoid exception is resources are missing in a page
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1757567&r1=1757566&r2=1757567&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Wed Aug 24 18:46:58 2016
@@ -555,8 +555,16 @@ public class PDFMergerUtility
newPage.setCropBox(page.getCropBox());
newPage.setMediaBox(page.getMediaBox());
newPage.setRotation(page.getRotation());
- // this is smart enough to just create references for resources that are used on multiple pages
- newPage.setResources(new PDResources((COSDictionary) cloner.cloneForNewDocument(page.getResources())));
+ PDResources resources = page.getResources();
+ if (resources != null)
+ {
+ // this is smart enough to just create references for resources that are used on multiple pages
+ newPage.setResources(new PDResources((COSDictionary) cloner.cloneForNewDocument(resources)));
+ }
+ else
+ {
+ newPage.setResources(new PDResources());
+ }
if (mergeStructTree)
{
updateStructParentEntries(newPage, destParentTreeNextKey);