svn commit: r1884086 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java

[le...@apache.org]

Author: lehmi
Date: Fri Dec  4 07:15:49 2020
New Revision: 1884086

URL: http://svn.apache.org/viewvc?rev=1884086&view=rev
Log:
PDFBOX-4999: don't skip size values when merging COSDictionaries as proposed by Michael Klink

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1884086&r1=1884085&r2=1884086&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java Fri Dec  4 07:15:49 2020
@@ -1400,24 +1400,14 @@ public class COSDictionary extends COSBa
     }
 
     /**
-     * This will add all of the dictionaries keys/values to this dictionary.
-     * Only called when adding keys to a trailer that already exists.
+     * This will add all of the dictionaries keys/values to this dictionary. Existing key/value pairs will be
+     * overwritten.
      *
-     * @param dic The dictionaries to get the keys from.
+     * @param dic The dictionaries to get the key/value pairs from.
      */
     public void addAll(COSDictionary dic)
     {
-        dic.forEach((key, value) ->
-        {
-            /*
-             * If we're at a second trailer, we have a linearized pdf file, meaning that the first Size entry represents
-             * all of the objects so we don't need to grab the second.
-             */
-            if (!COSName.SIZE.equals(key) || !items.containsKey(COSName.SIZE))
-            {
-                setItem(key, value);
-            }
-        });
+        dic.forEach(this::setItem);
     }
 
     /**