Changeset 726

Timestamp:

01/30/06 09:51:08 (3 years ago)

Author:

mfenniak

Message:

Adjustments to use new StreamObject? classes. Add graphics state push/pop around page content. Merge all page content into one stream.

Files:

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

pypdf/trunk/pyPdf/pdf.py

@@ -150 +150 @@
-                if value == None:
-                    print objects, value, origvalue
-hasattr(value, "has_key") and value.has_key("__streamdata__"
+isinstance(value, StreamObject
-                    # a dictionary value is a stream.  streams must be indirect
-                    # objects, so we need to change this value.
@@ -159 +159 @@
-            for i in range(len(data)):
-                value = self._sweepIndirectReferences(externMap, data[i])
-hasattr(value, "has_key") and value.has_key("__streamdata__"
+isinstance(value, StreamObject
-                    # an array value is a stream.  streams must be indirect
-                    # objects, so we need to change this value
@@ -275 +275 @@
-            assert objStm['/Type'] == '/ObjStm'
-            assert idx < objStm['/N']
-filters.decodeStreamData(objStm
+objStm.getData(
-            for i in range(objStm['/N']):
-                objnum = NumberObject.readFromStream(streamData)
@@ -375 +375 @@
-                assert xrefstream["/Type"] == "/XRef"
-                self.cacheIndirectObject(generation, idnum, xrefstream)
-filters.decodeStreamData(xrefstream
+xrefstream.getData(
-                num, size = xrefstream.get("/Index", [0, xrefstream.get("/Size")])
-                entrySizes = xrefstream.get("/W")
@@ -527 +527 @@
-    def _contentStreamRename(stream, rename):
-        if not rename:
-
-
-
-
+
-        stream = ContentStream(stream)
-newdata = StringIO()
-for operands,operator in stream.operations
-for op in operands:
+for operands,operator in stream.operands:
+    for i in range(len(operands))
+    op = oprands[i]
-                if isinstance(op, NameObject):
-
-
-
-
-
-
-
-
-
+
+
-    _contentStreamRename = staticmethod(_contentStreamRename)
+
+    def _pushPopGS(contents):
+        # adds a graphics state "push" and "pop" to the beginning and end
+        # of a content stream.  This isolates it from changes such as 
+        # transformation matricies.
+        stream = ContentStream(contents)
+        stream.operations.insert(0, [[], "q"])
+        stream.operations.append([[], "Q"])
+        return stream
+    _pushPopGS = staticmethod(_pushPopGS)
-
-    def mergePage(self, page2):
@@ -581 +581 @@
-
-        originalContent = self["/Contents"].getObject()
-
-
-
-
+
-
-        page2Content = page2['/Contents'].getObject()
-
-
-
+
+
+
+
+
-        self[NameObject('/Resources')] = newResources
-
@@ -630 +629 @@
-
-
-ictionary
+ecodedStream
-    def __init__(self, stream):
-        self.operations = []
-
-
-
-
+
+
-        stream = stream.getObject()
-        if isinstance(stream, ArrayObject):
-            data = ""
-            for s in stream:
-filters.decodeStreamData(s.getObject()
+s.getObject().getData(
-            stream = StringIO(data)
-        else:
-
+
+
+
+
-        operands = []
-        while True:
@@ -658 +658 @@
-                operands.append(readObject(stream, None))
-
+    def _getData(self):
+        newdata = StringIO()
+        for operands,operator in self.operations:
+            for op in operands:
+                op.writeToStream(newdata)
+                newdata.write(" ")
+            newdata.write(operator)
+            newdata.write("\n")
+        return newdata.getvalue()
+
+    def _setData(self, value):
+        self.__parseContentStream(StringIO(value))
+
+    _data = property(_getData, _setData)
+
-
-def convertToInt(d, size):
@@ -676 +691 @@
-    output = PdfFileWriter()
-
-..\\
+
-    page1 = input1.getPage(0)
-
-..\\
+
-    page2 = input2.getPage(0)
-    page3 = input2.getPage(1)
@@ -685 +700 @@
-    page1.mergePage(page3)
-
-..\\
+
-    page1.mergePage(input3.getPage(0))
-
-    output.addPage(page1)
-
-
-
+\\merge-test
+
+