Changeset 16159 for main/waeup.kofa/trunk/src

Timestamp:

10 Jul 2020, 06:11:44 (4 years ago)

Author:

Henrik Bettermann

Message:

Paint watermark first to make it transparent.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -20 +20 @@
 import grok
 import textwrap
+from copy import deepcopy
 from cgi import escape
 from time import time
@@ -941 +942 @@
             merger = PdfFileMerger()
             merger.append(StringIO(pdf_stream))
-            if watermark:
-                watermark = PdfFileReader(watermark)
             for file in mergefiles:
                 if watermark:
                     # Pass through all pages of each file
-                    # and merge with watermark page.
+                    # and merge with watermark page. Paint
+                    # watermark first to make it transparent.
                     marked_file = PdfFileWriter()
                     orig_file = PdfFileReader(file)
                     num_pages = orig_file.getNumPages()
                     for num in range(num_pages):
-                        page = orig_file.getPage(num)
-                        page.mergePage(watermark.getPage(0))
+                        watermark_file = PdfFileReader(watermark)
+                        page = watermark_file.getPage(0)
+                        page.mergePage(orig_file.getPage(num))
                         marked_file.addPage(page)
                     # Save into a file-like object
@@ -961 +962 @@
                 else:
                     # Just append the file object
-                    merger.append(file[1])
+                    merger.append(file)
             # Save into a file-like object
             tmp2 = StringIO()