From: Magnus Hagander Date: Fri, 3 Jan 2025 11:54:03 +0000 (+0100) Subject: Attempt some further fitz version fixes X-Git-Url: http://git.postgresql.org/gitweb/static/%7B%7Bpguslink%28?a=commitdiff_plain;h=f3df6367ed0ca2ef32517b413e20563cd1287ff2;p=pgeu-system.git Attempt some further fitz version fixes --- diff --git a/postgresqleu/digisign/backendviews.py b/postgresqleu/digisign/backendviews.py index 677a75f5..cba71dd4 100644 --- a/postgresqleu/digisign/backendviews.py +++ b/postgresqleu/digisign/backendviews.py @@ -128,7 +128,10 @@ def pdf_field_editor(request, conference, pdf, available_fields, fielddata, save # one PNG for each page. pdf = fitz.open('pdf', bytes(pdf)) pages = [] - pages = [(pagenum, base64.b64encode(page.getPixmap().getPNGData()).decode()) for pagenum, page in enumerate(pdf.pages())] + if fitz.version[0] > "1.19": + pages = [(pagenum, base64.b64encode(page.getPixmap().getPNGData()).decode()) for pagenum, page in enumerate(pdf.pages())] + else: + pages = [(pagenum, base64.b64encode(page.get_pixmap().tobytes(output='png')).decode()) for pagenum, page in enumerate(pdf.pages())] return render(request, 'digisign/pdf_field_editor.html', { 'conference': conference, diff --git a/postgresqleu/digisign/pdfutil.py b/postgresqleu/digisign/pdfutil.py index d484c73e..f8db8d04 100644 --- a/postgresqleu/digisign/pdfutil.py +++ b/postgresqleu/digisign/pdfutil.py @@ -68,7 +68,10 @@ def pdf_watermark_preview(pdfdata): wmio.seek(0) wmpdf = fitz.open('pdf', wmio) - wmpixmap = next(wmpdf.pages()).getPixmap() + if fitz.version[0] > "1.19": + wmpixmap = next(wmpdf.pages()).get_pixmap() + else: + wmpixmap = next(wmpdf.pages()).getPixmap() pdf = fitz.open('pdf', pdfdata) for pagenum, page in enumerate(pdf.pages()):