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 2018/01/30 19:24:20 UTC
svn commit: r1822680 - in
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox:
cos/COSName.java util/PDFMergerUtility.java
Author: tilman
Date: Tue Jan 30 19:24:20 2018
New Revision: 1822680
URL: http://svn.apache.org/viewvc?rev=1822680&view=rev
Log:
PDFBOX-4088: Root/StructTreeRoot/K/S must be name, not string
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java?rev=1822680&r1=1822679&r2=1822680&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java Tue Jan 30 19:24:20 2018
@@ -486,6 +486,10 @@ public final class COSName extends COSBa
/**
* A common COSName value.
*/
+ public static final COSName DOCUMENT = new COSName("Document");
+ /**
+ * A common COSName value.
+ */
public static final COSName DOMAIN = new COSName( "Domain" );
/**
* A common COSName value.
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java?rev=1822680&r1=1822679&r2=1822680&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java Tue Jan 30 19:24:20 2018
@@ -35,7 +35,6 @@ import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.cos.COSStream;
-import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.exceptions.COSVisitorException;
import org.apache.pdfbox.io.RandomAccess;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -72,8 +71,6 @@ public class PDFMergerUtility
*/
private static final Log LOG = LogFactory.getLog(PDFMergerUtility.class);
- private static final String STRUCTURETYPE_DOCUMENT = "Document";
-
private final List<InputStream> sources;
private final List<FileInputStream> fileInputStreams;
private String destinationFileName;
@@ -565,7 +562,7 @@ public class PDFMergerUtility
}
kDictLevel0.setItem(COSName.K, newKArray);
kDictLevel0.setItem(COSName.P, destStructTree);
- kDictLevel0.setItem(COSName.S, new COSString(STRUCTURETYPE_DOCUMENT));
+ kDictLevel0.setItem(COSName.S, COSName.DOCUMENT);
destStructTree.setK(kDictLevel0);
}
}