Merge branch 'v2.x'

QuLogic · QuLogic · commit 4b3350df0ec7 · 2016-06-21T21:44:08.000-04:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3959,15 +3959,15 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
 
         scales = s   # Renamed for readability below.
 
-        # load default marker from rcParams
-        if marker is None:
-            marker = rcParams['scatter.marker']
-
         # to be API compatible
         if marker is None and not (verts is None):
             marker = (verts, 0)
             verts = None
 
+        # load default marker from rcParams
+        if marker is None:
+            marker = rcParams['scatter.marker']
+
         if isinstance(marker, mmarkers.MarkerStyle):
             marker_obj = marker
         else:
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -68,6 +68,21 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
     BYTE_FORMAT = 1 # ARGB
 
 
+class ArrayWrapper:
+    """Thin wrapper around numpy ndarray to expose the interface
+       expected by cairocffi. Basically replicates the
+       array.array interface.
+    """
+    def __init__(self, myarray):
+        self.__array = myarray
+        self.__data = myarray.ctypes.data
+        self.__size = len(myarray.flatten())
+        self.itemsize = myarray.itemsize
+
+    def buffer_info(self):
+        return (self.__data, self.__size)
+
+
 class RendererCairo(RendererBase):
     fontweights = {
         100          : cairo.FONT_WEIGHT_NORMAL,
@@ -218,9 +233,25 @@ def draw_image(self, gc, x, y, im):
             im = im[:, :, (2, 1, 0, 3)]
         else:
             im = im[:, :, (3, 0, 1, 2)]
-        surface = cairo.ImageSurface.create_for_data(
-            memoryview(im.flatten()), cairo.FORMAT_ARGB32, im.shape[1], im.shape[0],
-            im.shape[1]*4)
+        if HAS_CAIRO_CFFI:
+            # cairocffi tries to use the buffer_info from array.array
+            # that we replicate in ArrayWrapper and alternatively falls back
+            # on ctypes to get a pointer to the numpy array. This works
+            # correctly on a numpy array in python3 but not 2.7. We replicate
+            # the array.array functionality here to get cross version support.
+            imbuffer = ArrayWrapper(im.flatten())
+        else:
+            # py2cairo uses PyObject_AsWriteBuffer
+            # to get a pointer to the numpy array this works correctly
+            # on a regular numpy array but not on a memory view.
+            # At the time of writing the latest release version of
+            # py3cairo still does not support create_for_data
+            imbuffer = im.flatten()
+        surface = cairo.ImageSurface.create_for_data(imbuffer,
+                                                     cairo.FORMAT_ARGB32,
+                                                     im.shape[1],
+                                                     im.shape[0],
+                                                     im.shape[1]*4)
         ctx = gc.ctx
         y = self.height - y - im.shape[0]
 
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/scatter_marker.png b/lib/matplotlib/tests/baseline_images/test_axes/scatter_marker.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1283,7 +1283,7 @@ def test_scatter_plot():
 @image_comparison(baseline_images=['scatter_marker'], remove_text=True,
                   extensions=['png'])
 def test_scatter_marker():
-    fig, (ax0, ax1) = plt.subplots(ncols=2)
+    fig, (ax0, ax1, ax2) = plt.subplots(ncols=3)
     ax0.scatter([3, 4, 2, 6], [2, 5, 2, 3],
                 c=[(1, 0, 0), 'y', 'b', 'lime'],
                 s=[60, 50, 40, 30],
@@ -1294,6 +1294,16 @@ def test_scatter_marker():
                 s=[60, 50, 40, 30],
                 edgecolors=['k', 'r', 'g', 'b'],
                 marker=mmarkers.MarkerStyle('o', fillstyle='top'))
+    # unit area ellipse
+    rx, ry = 3, 1
+    area = rx * ry * np.pi
+    theta = np.linspace(0, 2 * np.pi, 21)
+    verts = list(zip(np.cos(theta) * rx / area, np.sin(theta) * ry / area))
+    ax2.scatter([3, 4, 2, 6], [2, 5, 2, 3],
+                c=[(1, 0, 0), 'y', 'b', 'lime'],
+                s=[60, 50, 40, 30],
+                edgecolors=['k', 'r', 'g', 'b'],
+                verts=verts)
 
 
 @image_comparison(baseline_images=['scatter_2D'], remove_text=True,
