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 2017/05/20 15:30:03 UTC

svn commit: r1795663 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java

Author: tilman
Date: Sat May 20 15:30:03 2017
New Revision: 1795663

URL: http://svn.apache.org/viewvc?rev=1795663&view=rev
Log:
PDFBOX-3795: deprecate/remove mergeInto due to problems

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

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1795663&r1=1795662&r2=1795663&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java Sat May 20 15:30:03 2017
@@ -1386,7 +1386,11 @@ public class COSDictionary extends COSBa
      * key already exists in this dictionary then nothing is changed.
      *
      * @param dic The dic to get the keys from.
+     * 
+     * @deprecated This method should no longer be used and will be removed in 3.0 because it could
+     * also merge attributes that should not be merged (filter and length in a COSStream.
      */
+    @Deprecated
     public void mergeInto(COSDictionary dic)
     {
         for (Map.Entry<COSName, COSBase> entry : dic.entrySet())