Attachment 72188 Details for Bug 58569 – Repair pdfunite

[patch] Repair pdfunite

58569.patch (text/plain), 4.00 KB, created by Thomas Freitag on 2012-12-27 16:08:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2012-12-27 16:08:54 UTC

Size: 4.00 KB

patch

obsolete

>diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
>index b0678e8..1bd7839 100644
>--- a/poppler/PDFDoc.cc
>+++ b/poppler/PDFDoc.cc
>@@ -610,15 +610,15 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
>   OutStream *outStr;
>   XRef *yRef, *countRef;
>   int rootNum = getXRef()->getNumObjects() + 1;
>-
>-  // Make sure that special flags are set, because we are going to read
>-  // all objects, including Unencrypted ones.
>-  xref->scanSpecialFlags();
>-
>-  Guchar *fileKey;
>-  CryptAlgorithm encAlgorithm;
>-  int keyLength;
>-  xref->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength);
>+
>+  // Make sure that special flags are set, because we are going to read
>+  // all objects, including Unencrypted ones.
>+  xref->scanSpecialFlags();
>+
>+  Guchar *fileKey;
>+  CryptAlgorithm encAlgorithm;
>+  int keyLength;
>+  xref->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength);
> 
>   if (pageNo < 1 || pageNo > getNumPages()) {
>     error(errInternal, -1, "Illegal pageNo: {0:d}({1:d})", pageNo, getNumPages() );
>@@ -1526,13 +1526,13 @@ void PDFDoc::markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint n
>   }
> }
> 
>-Guint PDFDoc::writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset) 
>+Guint PDFDoc::writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset, GBool combine) 
> {
>   Guint objectsCount = 0; //count the number of objects in the XRef(s)
>-  Guchar *fileKey;
>-  CryptAlgorithm encAlgorithm;
>-  int keyLength;
>-  xRef->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength);
>+  Guchar *fileKey;
>+  CryptAlgorithm encAlgorithm;
>+  int keyLength;
>+  xRef->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength);
> 
>   for (int n = numOffset; n < xRef->getNumObjects(); n++) {
>     if (xRef->getEntry(n)->type != xrefEntryFree) {
>@@ -1543,11 +1543,13 @@ Guint PDFDoc::writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset)
>       objectsCount++;
>       getXRef()->fetch(ref.num - numOffset, ref.gen, &obj);
>       Guint offset = writeObjectHeader(&ref, outStr);
>-      if (xRef->getEntry(n)->getFlag(XRefEntry::Unencrypted)) {
>-        writeObject(&obj, outStr, NULL, cryptRC4, 0, 0, 0);
>-      } else {
>-        writeObject(&obj, outStr, fileKey, encAlgorithm, keyLength, ref.num, ref.gen);
>-      }
>+      if (combine) {
>+        writeObject(&obj, outStr, getXRef(), numOffset, NULL, cryptRC4, 0, 0, 0);
>+      } else if (xRef->getEntry(n)->getFlag(XRefEntry::Unencrypted)) {
>+        writeObject(&obj, outStr, NULL, cryptRC4, 0, 0, 0);
>+      } else {
>+        writeObject(&obj, outStr, fileKey, encAlgorithm, keyLength, ref.num, ref.gen);
>+      }
>       writeObjectFooter(outStr);
>       xRef->add(ref.num, ref.gen, offset, gTrue);
>       obj.free();
>diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
>index f3e9f68..c11e9ac 100644
>--- a/poppler/PDFDoc.h
>+++ b/poppler/PDFDoc.h
>@@ -243,7 +243,7 @@ public:
>   void replacePageDict(int pageNo, int rotate, PDFRectangle *mediaBox, PDFRectangle *cropBox, Object *pageCTM);
>   void markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset);
>   // write all objects used by pageDict to outStr
>-  Guint writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset);
>+  Guint writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset, GBool combine = gFalse);
>   static void writeObject (Object *obj, OutStream* outStr, XRef *xref, Guint numOffset, Guchar *fileKey,
>                            CryptAlgorithm encAlgorithm, int keyLength, int objNum, int objGen);
>   static void writeHeader(OutStream *outStr, int major, int minor);
>diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
>index 6502259..d34a635 100644
>--- a/utils/pdfunite.cc
>+++ b/utils/pdfunite.cc
>@@ -122,7 +122,7 @@ int main (int argc, char *argv[])
>       Dict *pageDict = page.getDict();
>       docs[i]->markPageObjects(pageDict, yRef, countRef, numOffset);
>     }
>-    objectsCount += docs[i]->writePageObjects(outStr, yRef, numOffset);
>+    objectsCount += docs[i]->writePageObjects(outStr, yRef, numOffset, gTrue);
>     numOffset = yRef->getNumObjects() + 1;
>   }
>

Actions: View | Splinter Review

Attachments on bug 58569: 72188

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.