Qt5: use qimage2ndarray.array2qimage() for creating a QImage as this supports PythonQt.

dbrnz · dbrnz · commit 0966b7bdd3f4 · 2019-10-24T13:09:15.000+13:00
diff --git a/lib/matplotlib/backends/backend_qt5agg.py b/lib/matplotlib/backends/backend_qt5agg.py
@@ -4,6 +4,8 @@
 
 import ctypes
 
+from qimage2ndarray import array2qimage
+
 from matplotlib.transforms import Bbox
 
 from .. import cbook
@@ -52,14 +54,15 @@ def paintEvent(self, event):
         buf = cbook._unmultiplied_rgba8888_to_premultiplied_argb32(
             memoryview(reg))
 
-        # clear the widget canvas
-        painter.eraseRect(rect)
-
-        qimage = QtGui.QImage(buf, buf.shape[1], buf.shape[0],
-                              QtGui.QImage.Format_ARGB32_Premultiplied)
+        # create a QImage from the array buffer
+        qimage = array2qimage(buf)
         if hasattr(qimage, 'setDevicePixelRatio'):
             # Not available on Qt4 or some older Qt5.
             qimage.setDevicePixelRatio(self._dpi_ratio)
+
+        # clear the widget canvas
+        painter.eraseRect(rect)
+
         origin = QtCore.QPoint(left, top)
         painter.drawImage(origin / self._dpi_ratio, qimage)
         # Adjust the buf reference count to work around a memory
