From 0e15258d9626a867116d760e9a0af58c7bb4abc3 Mon Sep 17 00:00:00 2001 From: Jorge Moraleda Date: Thu, 13 Feb 2020 16:29:39 -0800 Subject: [PATCH] Fixes pdfviewer when using PyMuPDF version 1.15 or above. Fixes #1350 --- wx/lib/pdfviewer/viewer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wx/lib/pdfviewer/viewer.py b/wx/lib/pdfviewer/viewer.py index 7b75724b..7f24a5cf 100644 --- a/wx/lib/pdfviewer/viewer.py +++ b/wx/lib/pdfviewer/viewer.py @@ -516,7 +516,10 @@ class mupdfProcessor(object): matrix = fitz.Matrix(scale, scale) try: pix = page.getPixmap(matrix=matrix) # MUST be keyword arg(s) - bmp = wx.Bitmap.FromBufferRGBA(pix.width, pix.height, pix.samples) + if [int(v) for v in fitz.version[1].split('.')] >= [1,15,0]: + bmp = wx.Bitmap.FromBuffer(pix.width, pix.height, pix.samples) + else: + bmp = wx.Bitmap.FromBufferRGBA(pix.width, pix.height, pix.samples) gc.DrawBitmap(bmp, 0, 0, pix.width, pix.height) self.zoom_error = False except (RuntimeError, MemoryError): @@ -1075,4 +1078,3 @@ class pdfPrintout(wx.Printout): self.view.pdfdoc.RenderPage(gc, pageno, sfac) return True -