Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x

jenshnielsen · jenshnielsen · commit fe720e20e131 · 2016-06-29T20:13:19.000+01:00
diff --git a/doc/users/plotting/examples/simple_legend01.py b/doc/users/plotting/examples/simple_legend01.py
@@ -4,15 +4,15 @@
 plt.subplot(211)
 plt.plot([1,2,3], label="test1")
 plt.plot([3,2,1], label="test2")
-# Place a legend above this legend, expanding itself to
+# Place a legend above this subplot, expanding itself to
 # fully use the given bounding box.
 plt.legend(bbox_to_anchor=(0., 1.02, 1., .102), loc=3,
            ncol=2, mode="expand", borderaxespad=0.)
 
 plt.subplot(223)
 plt.plot([1,2,3], label="test1")
 plt.plot([3,2,1], label="test2")
-# Place a legend to the right of this smaller figure.
+# Place a legend to the right of this smaller subplot.
 plt.legend(bbox_to_anchor=(1.05, 1), loc=2, borderaxespad=0.)
 
 plt.show()
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -852,7 +852,9 @@ def __call__(self, value, clip=None):
                 result = ma.array(np.clip(result.filled(vmax), vmin, vmax),
                                   mask=mask)
             # ma division is very slow; we can take a shortcut
-            resdat = result.data
+            # use np.asarray so data passed in as an ndarray subclass are
+            # interpreted as an ndarray. See issue #6622.
+            resdat = np.asarray(result.data)
             resdat -= vmin
             resdat /= (vmax - vmin)
             result = np.ma.array(resdat, mask=result.mask, copy=False)
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -1090,7 +1090,7 @@ def set_linestyle(self, ls):
 
         Parameters
         ----------
-        ls : { '-',  '--', '-.', ':'} and more see description
+        ls : { ``'-'``,  ``'--'``, ``'-.'``, ``':'``} and more see description
             The line style.
         """
         if not is_string_like(ls):
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -754,12 +754,12 @@ def __init__(self, s,
         self._minimumdescent = minimumdescent
 
     def set_text(self, s):
-        "set text"
+        "Set the text of this area as a string."
         self._text.set_text(s)
         self.stale = True
 
     def get_text(self):
-        "get text"
+        "Returns the string representation of this area's text"
         return self._text.get_text()
 
     def set_multilinebaseline(self, t):
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -510,7 +510,7 @@ def contains_points(self, points, transform=None, radius=0.0):
         if transform is not None:
             transform = transform.frozen()
         result = _path.points_in_path(points, radius, self, transform)
-        return result
+        return result.astype('bool')
 
     def contains_path(self, path, transform=None):
         """
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -11,6 +11,8 @@
 import numpy as np
 from numpy.testing import assert_array_almost_equal
 
+from nose.tools import assert_raises
+
 from matplotlib.image import imread
 from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
 from matplotlib.figure import Figure
@@ -290,6 +292,13 @@ def process_image(self, padded_src, dpi):
     ax.yaxis.set_visible(False)
 
 
+@cleanup
+def test_too_large_image():
+    fig = plt.figure(figsize=(300, 1000))
+    buff = io.BytesIO()
+    assert_raises(ValueError, fig.savefig, buff)
+
+
 if __name__ == "__main__":
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py
@@ -28,8 +28,9 @@ def test_point_in_path():
 
     path = Path(verts2, closed=True)
     points = [(0.5, 0.5), (1.5, 0.5)]
-
-    assert np.all(path.contains_points(points) == [True, False])
+    ret = path.contains_points(points)
+    assert ret.dtype == 'bool'
+    assert np.all(ret == [True, False])
 
 
 def test_contains_points_negative_radius():
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1827,6 +1827,18 @@ def _release(self, event):
         if not self.interactive:
             self.to_draw.set_visible(False)
 
+        # update the eventpress and eventrelease with the resulting extents
+        x1, x2, y1, y2 = self.extents
+        self.eventpress.xdata = x1
+        self.eventpress.ydata = y1
+        xy1 = self.ax.transData.transform_point([x1, y1])
+        self.eventpress.x, self.eventpress.y = xy1
+
+        self.eventrelease.xdata = x2
+        self.eventrelease.ydata = y2
+        xy2 = self.ax.transData.transform_point([x2, y2])
+        self.eventrelease.x, self.eventrelease.y = xy2
+
         if self.spancoords == 'data':
             xmin, ymin = self.eventpress.xdata, self.eventpress.ydata
             xmax, ymax = self.eventrelease.xdata, self.eventrelease.ydata
@@ -1848,27 +1860,16 @@ def _release(self, event):
         xproblems = self.minspanx is not None and spanx < self.minspanx
         yproblems = self.minspany is not None and spany < self.minspany
 
-        if (((self.drawtype == 'box') or (self.drawtype == 'line')) and
-                (xproblems or yproblems)):
-            # check if drawn distance (if it exists) is not too small in
-            # neither x nor y-direction
-            self.extents = [0, 0, 0, 0]
+        # check if drawn distance (if it exists) is not too small in
+        # either x or y-direction
+        if self.drawtype != 'none' and (xproblems or yproblems):
+            for artist in self.artists:
+                artist.set_visible(False)
+            self.update()
             return
 
-        # update the eventpress and eventrelease with the resulting extents
-        x1, x2, y1, y2 = self.extents
-        self.eventpress.xdata = x1
-        self.eventpress.ydata = y1
-        xy1 = self.ax.transData.transform_point([x1, y1])
-        self.eventpress.x, self.eventpress.y = xy1
-
-        self.eventrelease.xdata = x2
-        self.eventrelease.ydata = y2
-        xy2 = self.ax.transData.transform_point([x2, y2])
-        self.eventrelease.x, self.eventrelease.y = xy2
-
+        # call desired function
         self.onselect(self.eventpress, self.eventrelease)
-                                              # call desired function
         self.update()
 
         return False
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -177,6 +177,15 @@ static int PyRendererAgg_init(PyRendererAgg *self, PyObject *args, PyObject *kwd
         return -1;
     }
 
+    if (width >= 1 << 16 || height >= 1 << 16) {
+        PyErr_Format(
+            PyExc_ValueError,
+            "Image size of %dx%d pixels is too large. "
+            "It must be less than 2^16 in each direction.",
+            width, height);
+        return -1;
+    }
+
     CALL_CPP_INIT("RendererAgg", self->x = new RendererAgg(width, height, dpi))
 
     return 0;
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -18,6 +18,16 @@ typedef unsigned __int8   uint8_t;
 #    undef _XOPEN_SOURCE
 #endif
 
+// Prevent multiple conflicting definitions of swab from stdlib.h and unistd.h
+#if defined(__sun) || defined(sun)
+#if defined(_XPG4)
+#undef _XPG4
+#endif
+#if defined(_XPG3)
+#undef _XPG3
+#endif
+#endif
+
 #include <Python.h>
 
 #if PY_MAJOR_VERSION >= 3
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -25,6 +25,16 @@
 #    undef _XOPEN_SOURCE
 #endif
 
+// Prevent multiple conflicting definitions of swab from stdlib.h and unistd.h
+#if defined(__sun) || defined(sun)
+#if defined(_XPG4)
+#undef _XPG4
+#endif
+#if defined(_XPG3)
+#undef _XPG3
+#endif
+#endif
+
 #include <Python.h>
 #include <numpy/ndarrayobject.h>
 
