Changeset 711

Show
Ignore:
Timestamp:
01/27/06 12:28:11 (3 years ago)
Author:
mfenniak
Message:

add XObject, ColorSpace?, Pattern, Shading resource merging.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • pypdf/trunk/pyPdf/pdf.py

    r709 r711  
    548548        page2Resources = page2["/Resources"].getObject() 
    549549 
    550         newFonts, renameFonts = PageObject._mergeResources(originalResources, page2Resources, "/Font") 
    551         newResources[NameObject("/Font")] = newFonts 
    552         rename.update(renameFonts) 
    553  
    554         newGS, renameGS = PageObject._mergeResources(originalResources, page2Resources, "/ExtGState") 
    555         newResources[NameObject("/ExtGState")] = newGS 
    556         rename.update(renameGS) 
     550        for res in "/ExtGState", "/Font", "/XObject", "/ColorSpace", "/Pattern", "/Shading": 
     551            new, newrename = PageObject._mergeResources(originalResources, page2Resources, res) 
     552            if new: 
     553                newResources[NameObject(res)] = new 
     554                rename.update(newrename) 
    557555 
    558556        # Combine /ProcSet sets. 
    …… 
    677675    page1.mergePage(page3) 
    678676 
     677    input3 = PdfFileReader(file("..\\test\\cc-cc.pdf", "rb")) 
     678    page1.mergePage(input3.getPage(0)) 
     679 
    679680    output.addPage(page1) 
    680681    output.write(file("test.pdf", "wb"))