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 2025/05/17 13:13:57 UTC
svn commit: r1925627 - in /pdfbox/branches/3.0/pdfbox/src: main/java/org/apache/pdfbox/multipdf/Splitter.java test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Author: tilman
Date: Sat May 17 13:13:57 2025
New Revision: 1925627
URL: http://svn.apache.org/viewvc?rev=1925627&view=rev
Log:
PDFBOX-6009: recalculate ParentTreeNextKey because it might be missing
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java
pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Modified: pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java?rev=1925627&r1=1925626&r2=1925627&view=diff
==============================================================================
--- pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java (original)
+++ pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java Sat May 17 13:13:57 2025
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import org.apache.commons.logging.Log;
@@ -235,7 +236,13 @@ public class Splitter
dstNumberTreeNode.setNumbers(dstNumberTreeAsMap);
dstStructureTreeRoot.setParentTree(dstNumberTreeNode);
- dstStructureTreeRoot.setParentTreeNextKey(srcStructureTreeRoot.getParentTreeNextKey());
+ // get highest key + 1
+ Optional<Integer> max = dstNumberTreeAsMap.keySet().stream().max(Integer::compareTo);
+ if (max.isPresent())
+ {
+ dstStructureTreeRoot.setParentTreeNextKey(max.get() + 1);
+ }
+
dstStructureTreeRoot.setClassMap(srcStructureTreeRoot.getClassMap());
cloneRoleMap(srcStructureTreeRoot, dstStructureTreeRoot);
cloneIDTree(srcStructureTreeRoot, dstStructureTreeRoot);
Modified: pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java?rev=1925627&r1=1925626&r2=1925627&view=diff
==============================================================================
--- pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java (original)
+++ pdfbox/branches/3.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java Sat May 17 13:13:57 2025
@@ -663,6 +663,7 @@ class PDFMergerUtilityTest
void checkWithNumberTree(PDDocument document) throws IOException
{
PDDocumentCatalog documentCatalog = document.getDocumentCatalog();
+ assertNotEquals(-1, documentCatalog.getStructureTreeRoot().getParentTreeNextKey());
PDNumberTreeNode parentTree = documentCatalog.getStructureTreeRoot().getParentTree();
Map<Integer, COSObjectable> numberTreeAsMap = PDFMergerUtility.getNumberTreeAsMap(parentTree);
Set<Integer> keySet = numberTreeAsMap.keySet();