Changeset 709

Timestamp:

01/27/06 12:23:05 (3 years ago)

Author:

mfenniak

Message:

Add object-renaming to mergePage functionality. Pages can be merged from distinctly different PDF files now.

Files:

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

pypdf/trunk/pyPdf/pdf.py

@@ -65 +65 @@
-        info = DictionaryObject()
-        info.update({
-stompstompstomp.com
+pybrary.net
-                })
-        self._info = self._addObject(info)
@@ -478 +478 @@
-        """
-        assert angle % 90 == 0
-_
+
-        return self
-
@@ -489 +489 @@
-        """
-        assert angle % 90 == 0
-_
+
-        return self
-
-_
+
-        currentAngle = self.get("/Rotate", 0)
-        self[NameObject("/Rotate")] = NumberObject(currentAngle + angle)
-
-_
+
-        newRes = DictionaryObject()
-        newRes.update(res1.get(resource, DictionaryObject()).getObject())
@@ -503 +503 @@
-        for key in page2Res.keys():
-            if newRes.has_key(key) and newRes[key] != page2Res[key]:
-_
+
-                renameRes[key] = newname
-                newRes[newname] = page2Res[key]
@@ -509 +509 @@
-                newRes[key] = page2Res[key]
-        return newRes, renameRes
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def mergePage(self, page2):
-        """
-
+
+
+
-
-        Stability: Added in v1.4, will exist for all v1.x releases thereafter.
-        """
+
+        # First we work on merging the resource dictionaries.  This allows us
+        # to find out what symbols in the content streams we might need to
+        # rename.
+
+        newResources = DictionaryObject()
+        rename = {}
+        originalResources = self["/Resources"].getObject()
+        page2Resources = page2["/Resources"].getObject()
+
+        newFonts, renameFonts = PageObject._mergeResources(originalResources, page2Resources, "/Font")
+        newResources[NameObject("/Font")] = newFonts
+        rename.update(renameFonts)
+
+        newGS, renameGS = PageObject._mergeResources(originalResources, page2Resources, "/ExtGState")
+        newResources[NameObject("/ExtGState")] = newGS
+        rename.update(renameGS)
+
+        # Combine /ProcSet sets.
+        newResources[NameObject("/ProcSet")] = ArrayObject(
+            ImmutableSet(originalResources.get("/ProcSet", ArrayObject()).getObject()).union(
+                ImmutableSet(page2Resources.get("/ProcSet", ArrayObject()).getObject())
+            )
+        )
+
-        newContentArray = ArrayObject()
-
@@ -526 +572 @@
-
-        page2Content = page2['/Contents'].getObject()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        self[NameObject('/Contents')] = newContentArray
@@ -594 +621 @@
-
-    def __parseContentStream(self, stream):
-
+
+
+
+
+
+
+
+
+
-        operands = []
-        while True:
@@ -605 +640 @@
-                self.operations.append((operands, operator))
-                operands = []
-                print self.operations[-1]
-            else:
-                operands.append(readObject(stream, None))
+        stream.seek(0, 0)
+        data = stream.read()
+        if data.startswith("TJ"):
+            print data[:300]
+        print "----"
+        #print repr(stream.read(25))
+        #print repr(self.operations[-3:])
-
-
@@ -627 +668 @@
-    output = PdfFileWriter()
-
-PDFReference16
+5000-s1-05e
-    page1 = input1.getPage(0)
-
-
+
+
+
+
-    page1.mergePage(page2)
-    page1.mergePage(page3)
+
-    output.addPage(page1)
-
-    output.write(file("test.pdf", "wb"))
-