use wx.lib.wxcairo.BitmapFromImageSurface to convert from cairo to wx

DietmarSchwertberger · DietmarSchwertberger · commit 95f07482b77d · 2018-02-17T16:17:27.000+01:00
diff --git a/lib/matplotlib/backends/backend_wxcairo.py b/lib/matplotlib/backends/backend_wxcairo.py
@@ -11,7 +11,7 @@
 from .backend_cairo import cairo, FigureCanvasCairo, RendererCairo
 from .backend_wx import (
     _BackendWx, _FigureCanvasWxBase, FigureFrameWx, NavigationToolbar2Wx)
-from . import wx_compat as wxc
+import wx.lib.wxcairo as wxcairo
 
 
 class FigureFrameWxCairo(FigureFrameWx):
@@ -44,13 +44,7 @@ def draw(self, drawDC=None):
         self._renderer.set_ctx_from_surface(surface)
         self._renderer.set_width_height(width, height)
         self.figure.draw(self._renderer)
-        buf = np.frombuffer(surface.get_data(), dtype="uint8").reshape((height, width, 4))
-        if sys.byteorder == "little":
-            b, g, r, a = np.rollaxis(buf, -1)
-        else:
-            a, r, g, b = np.rollaxis(buf, -1)
-        rgba8888 = np.dstack([r, g, b, a])
-        self.bitmap = wxc.BitmapFromBuffer(width, height, rgba8888)
+        self.bitmap = wxcairo.BitmapFromImageSurface(surface)
         self._isDrawn = True
         self.gui_repaint(drawDC=drawDC, origin='WXCairo')
 
