Changeset 707

Timestamp:

01/27/06 10:24:45 (3 years ago)

Author:

mfenniak

Message:

Initial revision support merging multiple pages. It merges the resource directories properly, but *does not* rename duplicate instances of resources in the content streams yet.

Files:

• pypdf/trunk/pyPdf/pdf.py (modified) (4 diffs)

pypdf/trunk/pyPdf/pdf.py

@@ -46 +46 @@
-from generic import *
-from utils import readNonWhitespace, readUntilWhitespace
+from sets import ImmutableSet
-
-class PdfFileWriter(object):
@@ -157 +158 @@
-        elif isinstance(data, ArrayObject):
-            for i in range(len(data)):
-
+
+
+
+
+
+
-            return data
-        elif isinstance(data, IndirectObject):
@@ -490 +496 @@
-        self[NameObject("/Rotate")] = NumberObject(currentAngle + angle)
-
+    def __mergeResources(res1, res2, resource):
+        newRes = DictionaryObject()
+        newRes.update(res1.get(resource, DictionaryObject()).getObject())
+        page2Res = res2.get(resource, DictionaryObject()).getObject()
+        renameRes = {}
+        for key in page2Res.keys():
+            if newRes.has_key(key) and newRes[key] != page2Res[key]:
+                newname = NameObject(key + "_renamed")
+                renameRes[key] = newname
+                newRes[newname] = page2Res[key]
+            elif not newRes.has_key(key):
+                newRes[key] = page2Res[key]
+        return newRes, renameRes
+    __mergeResources = staticmethod(__mergeResources)
+
+    def mergePage(self, page2):
+        """
+        Merges the content streams of two pages into one.
+
+        Stability: Added in v1.4, will exist for all v1.x releases thereafter.
+        """
+        newContentArray = ArrayObject()
+
+        originalContent = self["/Contents"].getObject()
+        if isinstance(originalContent, ArrayObject):
+            newContentArray.extend(originalContent)
+        else:
+            newContentArray.append(originalContent)
+
+        page2Content = page2['/Contents'].getObject()
+        if isinstance(page2Content, ArrayObject):
+            newContentArray.extend(page2Content)
+        else:
+            newContentArray.append(page2Content)
+
+        newResources = DictionaryObject()
+
+        originalResources = self["/Resources"].getObject()
+        page2Resources = page2["/Resources"].getObject()
+
+        newFonts, renameFonts = PageObject.__mergeResources(originalResources, page2Resources, "/Font")
+        newResources[NameObject("/Font")] = newFonts
+        newGS, renameGS = PageObject.__mergeResources(originalResources, page2Resources, "/ExtGState")
+        newResources[NameObject("/ExtGState")] = newGS
+
+        newResources[NameObject("/ProcSet")] = ArrayObject(
+            ImmutableSet(originalResources.get("/ProcSet", ArrayObject()).getObject()).union(
+                ImmutableSet(page2Resources.get("/ProcSet", ArrayObject()).getObject())
+            )
+        )
+
+        self[NameObject('/Contents')] = newContentArray
+        self[NameObject('/Resources')] = newResources
+
-addRectangleAccessor(PageObject, "mediaBox", "/MediaBox", (),
-        """A rectangle, expressed in default user space units, defining the
@@ -567 +627 @@
-    output = PdfFileWriter()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    output.write(file("test.pdf", "wb"))
-