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 2021/09/08 17:55:14 UTC

svn commit: r1893152 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java

Author: tilman
Date: Wed Sep  8 17:55:14 2021
New Revision: 1893152

URL: http://svn.apache.org/viewvc?rev=1893152&view=rev
Log:
PDFBOX-5278: don't modify type, as suggested by Michael Klink

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java?rev=1893152&r1=1893151&r2=1893152&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java Wed Sep  8 17:55:14 2021
@@ -219,7 +219,15 @@ public abstract class PDAnnotation imple
     public PDAnnotation(COSDictionary dict)
     {
         dictionary = dict;
-        dictionary.setItem(COSName.TYPE, COSName.ANNOT);
+        COSBase type = dict.getDictionaryObject(COSName.TYPE);
+        if (type == null)
+        {
+            dictionary.setItem(COSName.TYPE, COSName.ANNOT);
+        }
+        else if (!COSName.ANNOT.equals(type))
+        {
+            LOG.warn("Annotation has type " + type + ", further mayhem may follow");
+        }
     }
 
     /**
@@ -406,6 +414,7 @@ public abstract class PDAnnotation imple
         }
         else
         {
+// PDAppearanceStream extends PDFormXObject, but does not reference the resource cache
             return normalAppearance.getAppearanceStream();
         }
     }