Save a copy in tkcairo.

anntzer · anntzer · commit 9f7f71ad18be · 2018-03-05T18:14:10.000-08:00
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -46,15 +46,21 @@ def raise_msg_to_str(msg):
         msg = '\n'.join(map(str, msg))
     return msg
 
+
 def error_msg_tkpaint(msg, parent=None):
     from six.moves import tkinter_messagebox as tkMessageBox
     tkMessageBox.showerror("matplotlib", msg)
 
 
-def blit(photoimage, aggimage, bbox=None):
+def blit(photoimage, aggimage, offsets, bbox=None):
     """
     Blit *aggimage* to *photoimage*.
 
+    *offsets* is a tuple describing how to fill the ``offset`` field of the
+    ``Tk_PhotoImageBlock`` struct: it should be (0, 1, 2, 3) for RGBA8888 data,
+    (2, 1, 0, 3) for little-endian ARBG32 (i.e. GBRA8888) data and (1, 2, 3, 0)
+    for big-endian ARGB32 (i.e. ARGB8888) data.
+
     If *bbox* is passed, it defines the region that gets blitted.
     """
     data = np.asarray(aggimage)
@@ -67,7 +73,7 @@ def blit(photoimage, aggimage, bbox=None):
     else:
         photoimage.blank()
         bboxptr = (0, width, 0, height)
-    _tkagg.blit(photoimage, dataptr, bboxptr)
+    _tkagg.blit(photoimage, dataptr, offsets, bboxptr)
 
 
 class TimerTk(TimerBase):
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -7,12 +7,12 @@
 class FigureCanvasTkAgg(FigureCanvasAgg, FigureCanvasTk):
     def draw(self):
         super(FigureCanvasTkAgg, self).draw()
-        _backend_tk.blit(self._tkphoto, self.renderer._renderer)
+        _backend_tk.blit(self._tkphoto, self.renderer._renderer, (0, 1, 2, 3))
         self._master.update_idletasks()
 
     def blit(self, bbox=None):
         _backend_tk.blit(
-            self._tkphoto, self.renderer._renderer, bbox=bbox)
+            self._tkphoto, self.renderer._renderer, (0, 1, 2, 3), bbox=bbox)
         self._master.update_idletasks()
 
 
diff --git a/lib/matplotlib/backends/backend_tkcairo.py b/lib/matplotlib/backends/backend_tkcairo.py
@@ -20,13 +20,9 @@ def draw(self):
         self._renderer.set_width_height(width, height)
         self.figure.draw(self._renderer)
         buf = np.reshape(surface.get_data(), (height, width, 4))
-        # Convert from ARGB32 to RGBA8888.  Using .take() instead of directly
-        # indexing ensures C-contiguity of the result, which is needed by
-        # _backend_tk.
-        buf = buf.take(
-            [2, 1, 0, 3] if sys.byteorder == "little" else [1, 2, 3, 0],
-            axis=2)
-        _backend_tk.blit(self._tkphoto, buf)
+        _backend_tk.blit(
+            self._tkphoto, buf,
+            (2, 1, 0, 3) if sys.byteorder == "little" else (1, 2, 3, 0))
         self._master.update_idletasks()
 
 
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -211,13 +211,15 @@ static PyObject *mpl_tk_blit(PyObject *self, PyObject *args) {
     int height, width;
     unsigned char *data_ptr;
     int x1, x2, y1, y2;
+    int o0, o1, o2, o3;
     Tcl_Interp *interp;
     char const *photo_name;
     Tk_PhotoHandle photo;
     Tk_PhotoImageBlock block;
-    if (!PyArg_ParseTuple(args, "O(iin)(iiii):blit",
+    if (!PyArg_ParseTuple(args, "O(iin)(iiii)(iiii):blit",
                           &py_photo,
                           &height, &width, &data_ptr,
+                          &o0, &o1, &o2, &o3,
                           &x1, &x2, &y1, &y2)) {
         goto exit;
     }
@@ -238,10 +240,10 @@ static PyObject *mpl_tk_blit(PyObject *self, PyObject *args) {
     block.height = y2 - y1;
     block.pitch = 4 * width;
     block.pixelSize = 4;
-    block.offset[0] = 0;
-    block.offset[1] = 1;
-    block.offset[2] = 2;
-    block.offset[3] = 3;
+    block.offset[0] = o0;
+    block.offset[1] = o1;
+    block.offset[2] = o2;
+    block.offset[3] = o3;
     TK_PHOTO_PUT_BLOCK_NO_COMPOSITE(
         photo, &block, x1, height - y2, x2 - x1, y2 - y1);
 exit:
