Attachment 115174 Details for Bug 90066 – insert embedded files in result pdf

[patch] insert embedded files in result pdf

90066-all.patch (text/plain), 7.71 KB, created by Thomas Freitag on 2015-04-18 11:52:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2015-04-18 11:52:36 UTC

Size: 7.71 KB

patch

obsolete

>diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
>index 71a1efe..59a03d8 100644
>--- a/poppler/PDFDoc.cc
>+++ b/poppler/PDFDoc.cc
>@@ -1561,7 +1561,6 @@ void PDFDoc::replacePageDict(int pageNo, int rotate,
> 
> void PDFDoc::markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset, int oldRefNum, int newRefNum) 
> {
>-  pageDict->remove("Names");
>   pageDict->remove("OpenAction");
>   pageDict->remove("Outlines");
>   pageDict->remove("StructTreeRoot");
>diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
>index b35090c..db98166 100644
>--- a/utils/pdfunite.cc
>+++ b/utils/pdfunite.cc
>@@ -37,6 +37,125 @@ static const ArgDesc argDesc[] = {
>   {NULL}
> };
> 
>+void doMergeNameTree(PDFDoc *doc, XRef *srcXRef, XRef *countRef, int oldRefNum, int newRefNum, Dict *srcNameTree, Dict *mergeNameTree, int numOffset) {
>+  Object mergeNameArray;
>+  Object srcNameArray;
>+  mergeNameTree->lookup("Names", &mergeNameArray);
>+  srcNameTree->lookup("Names", &srcNameArray);
>+  if (mergeNameArray.isArray() && srcNameArray.isArray()) {
>+    Object *newNameArray = new Object();
>+    newNameArray->initArray(srcXRef);
>+    int j = 0;
>+    for (int i = 0; i < srcNameArray.arrayGetLength() - 1; i += 2) {
>+      Object key;
>+      Object value;
>+      srcNameArray.arrayGetNF(i, &key);
>+      srcNameArray.arrayGetNF(i + 1, &value);
>+      if (key.isString() && value.isRef()) {
>+        while (j < mergeNameArray.arrayGetLength() - 1) {
>+          Object mkey;
>+          Object mvalue;
>+          mergeNameArray.arrayGetNF(j, &mkey);
>+          mergeNameArray.arrayGetNF(j + 1, &mvalue);
>+          if (mkey.isString() && mvalue.isRef()) {
>+            if (mkey.getString()->cmp(key.getString()) < 0) {
>+              Object *newKey = new Object();
>+	      newKey->initString(new GooString(mkey.getString()->getCString()));
>+              newNameArray->arrayAdd(newKey);
>+              Object *newValue = new Object();
>+              newValue->initRef(mvalue.getRef().num + numOffset, mvalue.getRef().gen);
>+              newNameArray->arrayAdd(newValue);
>+              j += 2;
>+            } else if (mkey.getString()->cmp(key.getString()) == 0) {
>+              j += 2;
>+            } else {
>+              mkey.free();
>+              mvalue.free();
>+              break;
>+            }
>+          } else {
>+            j += 2;
>+          }
>+          mkey.free();
>+          mvalue.free();
>+        }
>+        Object *newKey = new Object();
>+	newKey->initString(new GooString(key.getString()->getCString()));
>+        newNameArray->arrayAdd(newKey);
>+        Object *newValue = new Object();
>+        newValue->initRef(value.getRef().num, value.getRef().gen);
>+        newNameArray->arrayAdd(newValue);
>+      }
>+      key.free();
>+      value.free();
>+    }
>+    while (j < mergeNameArray.arrayGetLength() - 1) {
>+      Object mkey;
>+      Object mvalue;
>+      mergeNameArray.arrayGetNF(j, &mkey);
>+      mergeNameArray.arrayGetNF(j + 1, &mvalue);
>+      if (mkey.isString() && mvalue.isRef()) {
>+        Object *newKey = new Object();
>+        newKey->initString(new GooString(mkey.getString()->getCString()));
>+        newNameArray->arrayAdd(newKey);
>+        Object *newValue = new Object();
>+        newValue->initRef(mvalue.getRef().num + numOffset, mvalue.getRef().gen);
>+        newNameArray->arrayAdd(newValue);
>+      }
>+      j += 2;
>+      mkey.free();
>+      mvalue.free();
>+    }
>+    srcNameTree->set("Names", newNameArray);
>+    doc->markPageObjects(mergeNameTree, srcXRef, countRef, numOffset, oldRefNum, newRefNum);
>+  } else if (srcNameArray.isNull() && mergeNameArray.isArray()) {
>+    Object *newNameArray = new Object();
>+    newNameArray->initArray(srcXRef);
>+    for (int i = 0; i < mergeNameArray.arrayGetLength() - 1; i += 2) {
>+      Object key;
>+      Object value;
>+      mergeNameArray.arrayGetNF(i, &key);
>+      mergeNameArray.arrayGetNF(i + 1, &value);
>+      if (key.isString() && value.isRef()) {
>+        Object *newKey = new Object();
>+	newKey->initString(new GooString(key.getString()->getCString()));
>+        newNameArray->arrayAdd(newKey);
>+        Object *newValue = new Object();
>+        newValue->initRef(value.getRef().num + numOffset, value.getRef().gen);
>+        newNameArray->arrayAdd(newValue);
>+      }
>+      key.free();
>+      value.free();
>+    }
>+    GooString *newKey = new GooString("Names");
>+    srcNameTree->add(newKey->getCString(), newNameArray);
>+    doc->markPageObjects(mergeNameTree, srcXRef, countRef, numOffset, oldRefNum, newRefNum);
>+  }
>+  mergeNameArray.free();
>+  srcNameArray.free();
>+}
>+
>+void doMergeNameDict(PDFDoc *doc, XRef *srcXRef, XRef *countRef, int oldRefNum, int newRefNum, Dict *srcNameDict, Dict *mergeNameDict, int numOffset) {
>+  for (int i = 0; i < mergeNameDict->getLength(); i++) {
>+    const char *key = mergeNameDict->getKey(i);
>+    Object mergeNameTree;
>+    Object srcNameTree;
>+    mergeNameDict->lookup(key, &mergeNameTree);
>+    srcNameDict->lookup(key, &srcNameTree);
>+    if (srcNameTree.isDict() && mergeNameTree.isDict()) {
>+      doMergeNameTree(doc, srcXRef, countRef, oldRefNum, newRefNum, srcNameTree.getDict(), mergeNameTree.getDict(), numOffset);
>+    } else if (srcNameTree.isNull() && mergeNameTree.isDict()) {
>+      Object *newNameTree = new Object();
>+      newNameTree->initDict(srcXRef);
>+      doMergeNameTree(doc, srcXRef, countRef, oldRefNum, newRefNum, newNameTree->getDict(), mergeNameTree.getDict(), numOffset);
>+      GooString *newKey = new GooString(key);
>+      srcNameDict->add(newKey->getCString(), newNameTree);
>+    }    
>+    srcNameTree.free();
>+    mergeNameTree.free();
>+  }
>+}
>+
> ///////////////////////////////////////////////////////////////////////////
> int main (int argc, char *argv[])
> ///////////////////////////////////////////////////////////////////////////
>@@ -109,10 +228,11 @@ int main (int argc, char *argv[])
>   yRef->add(0, 65535, 0, gFalse);
>   PDFDoc::writeHeader(outStr, majorVersion, minorVersion);
> 
>-  // handle OutputIntents, AcroForm & OCProperties
>+  // handle OutputIntents, AcroForm, OCProperties & Names
>   Object intents;
>   Object afObj;
>   Object ocObj;
>+  Object names;
>   if (docs.size() >= 1) {
>     Object catObj;
>     docs[0]->getXRef()->getCatalog(&catObj);
>@@ -127,6 +247,10 @@ int main (int argc, char *argv[])
>     if (!ocObj.isNull() && ocObj.isDict()) {
>       docs[0]->markPageObjects(ocObj.getDict(), yRef, countRef, 0, refPage->num, refPage->num);
>     }
>+    catDict->lookup("Names", &names);
>+    if (!names.isNull() && names.isDict()) {
>+      docs[0]->markPageObjects(names.getDict(), yRef, countRef, 0, refPage->num, refPage->num);
>+    }
>     if (intents.isArray() && intents.arrayGetLength() > 0) {
>       for (i = 1; i < (int) docs.size(); i++) {
>         Object pagecatObj, pageintents;
>@@ -227,6 +351,19 @@ int main (int argc, char *argv[])
>         annotsObj.free();
>       }
>     }
>+    Object pageCatObj, pageNames;
>+    docs[i]->getXRef()->getCatalog(&pageCatObj);
>+    Dict *pageCatDict = pageCatObj.getDict();
>+    pageCatDict->lookup("Names", &pageNames);
>+    if (!pageNames.isNull() && pageNames.isDict()) {
>+      if (!names.isDict()) {
>+        names.free();
>+        names.initDict(yRef);
>+      }
>+      doMergeNameDict(docs[i], yRef, countRef, 0, 0, names.getDict(), pageNames.getDict(), numOffset);
>+    }
>+    pageNames.free();
>+    pageCatObj.free();
>     objectsCount += docs[i]->writePageObjects(outStr, yRef, numOffset, gTrue);
>     numOffset = yRef->getNumObjects() + 1;
>   }
>@@ -261,6 +398,12 @@ int main (int argc, char *argv[])
>     PDFDoc::writeObject(&ocObj, outStr, yRef, 0, NULL, cryptRC4, 0, 0, 0);
>     ocObj.free();
>   }
>+  // insert Names
>+  if (!names.isNull() && names.isDict()) {
>+    outStr->printf(" /Names ");
>+    PDFDoc::writeObject(&names, outStr, yRef, 0, NULL, cryptRC4, 0, 0, 0);
>+    names.free();
>+  }
>   outStr->printf(">>\nendobj\n");
>   objectsCount++;
>

Actions: View | Splinter Review

Attachments on bug 90066: 115149 | 115160 | 115161 | 115163 | 115174 | 115244 | 117257

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.