You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/05/30 17:38:39 UTC

svn commit: r1890325 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java

Author: lehmi
Date: Sun May 30 17:38:39 2021
New Revision: 1890325

URL: http://svn.apache.org/viewvc?rev=1890325&view=rev
Log:
PDFBOX-4952: simplify

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1890325&r1=1890324&r2=1890325&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java Sun May 30 17:38:39 2021
@@ -318,9 +318,9 @@ public class COSWriter implements ICOSVi
         return compressParameters != null && compressParameters.isCompress();
     }
 
-    private void prepareIncrement(PDDocument doc)
+    private void prepareIncrement()
     {
-        COSDocument cosDoc = doc.getDocument();
+        COSDocument cosDoc = pdDocument.getDocument();
         Set<COSObjectKey> keySet = cosDoc.getXrefTable().keySet();
         for (COSObjectKey cosObjectKey : keySet)
         {
@@ -743,9 +743,8 @@ public class COSWriter implements ICOSVi
             trailer.setLong(COSName.PREV, doc.getStartXref());
             if (hybridPrev != -1)
             {
-                COSName xrefStm = COSName.XREF_STM;
-                trailer.removeItem(xrefStm);
-                trailer.setLong(xrefStm, getStartxref());
+                trailer.removeItem(COSName.XREF_STM);
+                trailer.setLong(COSName.XREF_STM, getStartxref());
             }
             doWriteXRefTable();
             doWriteTrailer(doc);
@@ -1470,26 +1469,24 @@ public class COSWriter implements ICOSVi
      */
     public void write(PDDocument doc, SignatureInterface signInterface) throws IOException
     {
-        Long idTime = doc.getDocumentId() == null ? System.currentTimeMillis() : 
-                                                    doc.getDocumentId();
-
         pdDocument = doc;
         signatureInterface = signInterface;
         number = pdDocument.getDocument().getHighestXRefObjectNumber();
-
         if(incrementalUpdate)
         {
-            prepareIncrement(doc);
+            prepareIncrement();
         }
-        
+        Long idTime = pdDocument.getDocumentId() == null ? System.currentTimeMillis()
+                : pdDocument.getDocumentId();
+        COSDocument cosDoc = pdDocument.getDocument();
+        COSDictionary trailer = cosDoc.getTrailer();
+
         // if the document says we should remove encryption, then we shouldn't encrypt
         if(doc.isAllSecurityToBeRemoved())
         {
             willEncrypt = false;
             // also need to get rid of the "Encrypt" in the trailer so readers 
             // don't try to decrypt a document which is not encrypted
-            COSDocument cosDoc = doc.getDocument();
-            COSDictionary trailer = cosDoc.getTrailer();
             trailer.removeItem(COSName.ENCRYPT);
         }
         else
@@ -1515,8 +1512,6 @@ public class COSWriter implements ICOSVi
             }
         }
 
-        COSDocument cosDoc = pdDocument.getDocument();
-        COSDictionary trailer = cosDoc.getTrailer();
         COSArray idArray;
         boolean missingID = true;
         COSBase base = trailer.getDictionaryObject(COSName.ID);