svn commit: r1883850 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: cos/COSBase.java cos/COSObject.java pdfparser/COSParser.java

[le...@apache.org]

Author: lehmi
Date: Fri Nov 27 07:06:24 2020
New Revision: 1883850

URL: http://svn.apache.org/viewvc?rev=1883850&view=rev
Log:
PDFBOX-4952: store COSObjectKey of indirect object within the object itself

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java?rev=1883850&r1=1883849&r2=1883850&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSBase.java Fri Nov 27 07:06:24 2020
@@ -28,6 +28,7 @@ import java.io.IOException;
 public abstract class COSBase implements COSObjectable
 {
     private boolean direct;
+    private COSObjectKey key;
 
     /**
      * Constructor.
@@ -76,4 +77,25 @@ public abstract class COSBase implements
     {
       this.direct = direct;
     }
+
+    /**
+     * This will return the COSObjectKey of an indirect object.
+     * 
+     * @return the COSObjectKey
+     */
+    public COSObjectKey getKey()
+    {
+        return key;
+    }
+
+    /**
+     * Set the COSObjectKey of an indirect object.
+     * 
+     * @param key the COSObjectKey of the indirect object
+     */
+    public void setKey(COSObjectKey key)
+    {
+        this.key = key;
+    }
+
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java?rev=1883850&r1=1883849&r2=1883850&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java Fri Nov 27 07:06:24 2020
@@ -45,7 +45,19 @@ public class COSObject extends COSBase i
      */
     public COSObject(COSBase object)
     {
-        this(object, null);
+        baseObject = object;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param object The object that this encapsulates.
+     * @param objectKey The COSObjectKey of the encapsulated object
+     */
+    public COSObject(COSBase object, COSObjectKey objectKey)
+    {
+        this(objectKey, null);
+        baseObject = object;
     }
 
     /**
@@ -73,6 +85,7 @@ public class COSObject extends COSBase i
         this.parser = parser;
         objectNumber = key.getNumber();
         generationNumber = key.getGeneration();
+        setKey(key);
     }
 
     /**

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1883850&r1=1883849&r2=1883850&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Fri Nov 27 07:06:24 2020
@@ -769,6 +769,7 @@ public class COSParser extends BaseParse
             {
                 parser = new PDFObjectStreamParser((COSStream) objstmBaseObj, document);
                 objectStreamObject = parser.parseObject(key.getNumber());
+                objectStreamObject.setKey(key);
             }
             catch (IOException ex)
             {