Merge remote-tracking branch 'upstream/v1.2.x'

Author: mdboom

examples/animation/old_animation/draggable_legend.py

@@ -20,10 +20,10 @@
 
 from matplotlib.offsetbox import OffsetImage, AnnotationBbox
 
-fn = get_sample_data("lena.png", asfileobj=False)
-arr_lena = read_png(fn)
+fn = get_sample_data("ada.png", asfileobj=False)
+arr_ada = read_png(fn)
 
-imagebox = OffsetImage(arr_lena, zoom=0.2)
+imagebox = OffsetImage(arr_ada, zoom=0.2)
 
 ab = AnnotationBbox(imagebox, xy,
                     xybox=(120., -80.),

examples/misc/sample_data_demo.py

@@ -5,7 +5,7 @@
 from __future__ import print_function
 import matplotlib.cbook as cbook
 import matplotlib.pyplot as plt
-fname = cbook.get_sample_data('lena.png', asfileobj=False)
+fname = cbook.get_sample_data('ada.png', asfileobj=False)
 
 print('fname', fname)
 im = plt.imread(fname)

examples/pylab_examples/demo_annotation_box.py

@@ -69,7 +69,7 @@
 
 
     from matplotlib._png import read_png
-    fn = get_sample_data("lena.png", asfileobj=False)
+    fn = get_sample_data("grace_hopper.png", asfileobj=False)
     arr_lena = read_png(fn)
 
     imagebox = OffsetImage(arr_lena, zoom=0.2)

examples/pylab_examples/demo_text_path.py

@@ -63,7 +63,7 @@ def draw(self, renderer=None):
     ax = plt.subplot(211)
 
     from matplotlib._png import read_png
-    fn = get_sample_data("lena.png", asfileobj=False)
+    fn = get_sample_data("grace_hopper.png", asfileobj=False)
     arr = read_png(fn)
 
     text_path = TextPath((0, 0), "!?", size=150)

examples/pylab_examples/image_demo3.py

@@ -7,7 +7,7 @@
 
 import matplotlib.cbook as cbook
 
-datafile = cbook.get_sample_data('lena.jpg')
+datafile = cbook.get_sample_data('grace_hopper.jpg')
 lena = Image.open(datafile)
 dpi = rcParams['figure.dpi']
 figsize = lena.size[0]/dpi, lena.size[1]/dpi

lib/matplotlib/mpl-data/sample_data/ada.png

@@ -161,6 +161,12 @@ def get_rotate_label(self, text):
 
     def _get_coord_info(self, renderer):
         minx, maxx, miny, maxy, minz, maxz = self.axes.get_w_lims()
+        if minx > maxx:
+            minx, maxx = maxx, minx
+        if miny > maxy:
+            miny, maxy = maxy, miny
+        if minz > maxz:
+            minz, maxz = maxz, minz
         mins = np.array((minx, miny, minz))
         maxs = np.array((maxx, maxy, maxz))
         centers = (maxs + mins) / 2.
@@ -205,9 +211,13 @@ def draw(self, renderer):
         index = info['i']
 
         # filter locations here so that no extra grid lines are drawn
-        interval = self.get_view_interval()
-        majorLocs = [loc for loc in majorLocs if \
-                interval[0] <= loc <= interval[1]]
+        locmin, locmax = self.get_view_interval()
+        if locmin > locmax:
+            locmin, locmax = locmax, locmin
+
+        # Rudimentary clipping
+        majorLocs = [loc for loc in majorLocs if
+                     locmin <= loc <= locmax]
         self.major.formatter.set_locs(majorLocs)
         majorLabels = [self.major.formatter(val, i)
                        for i, val in enumerate(majorLocs)]

lib/matplotlib/mpl-data/sample_data/grace_hopper.jpg

@@ -39,6 +39,7 @@
 
 #include "numpy/arrayobject.h"
 #include "agg_py_transforms.h"
+#include "file_compat.h"
 
 #ifndef M_PI
 #define M_PI       3.14159265358979323846
@@ -2028,44 +2029,42 @@ RendererAgg::write_rgba(const Py::Tuple& args)
 
     FILE *fp = NULL;
     Py::Object py_fileobj = Py::Object(args[0]);
-
-    #if PY3K
-    int fd = PyObject_AsFileDescriptor(py_fileobj.ptr());
-    PyErr_Clear();
-    #endif
+    PyObject* py_file = NULL;
+    bool close_file = false;
 
     if (py_fileobj.isString())
     {
-        std::string fileName = Py::String(py_fileobj);
-        const char *file_name = fileName.c_str();
-        if ((fp = fopen(file_name, "wb")) == NULL)
-            throw Py::RuntimeError(
-                Printf("Could not open file %s", file_name).str());
-        if (fwrite(pixBuffer, 1, NUMBYTES, fp) != NUMBYTES)
-        {
-            fclose(fp);
-            throw Py::RuntimeError(
-                Printf("Error writing to file %s", file_name).str());
+        if ((py_file = npy_PyFile_OpenFile(py_fileobj.ptr(), (char *)"wb")) == NULL) {
+            throw Py::Exception();
         }
+        close_file = true;
     }
-    #if PY3K
-    else if (fd != -1)
+    else
     {
-        if (write(fd, pixBuffer, NUMBYTES) != (ssize_t)NUMBYTES)
-        {
-            throw Py::RuntimeError("Error writing to file");
-        }
+        py_file = py_fileobj.ptr();
     }
-    #else
-    else if (PyFile_CheckExact(py_fileobj.ptr()))
+
+    if ((fp = npy_PyFile_Dup(py_file, (char *)"wb")))
     {
-        fp = PyFile_AsFile(py_fileobj.ptr());
         if (fwrite(pixBuffer, 1, NUMBYTES, fp) != NUMBYTES)
         {
+            npy_PyFile_DupClose(py_file, fp);
+
+            if (close_file) {
+                npy_PyFile_CloseFile(py_file);
+                Py_DECREF(py_file);
+            }
+
             throw Py::RuntimeError("Error writing to file");
         }
+
+        npy_PyFile_DupClose(py_file, fp);
+
+        if (close_file) {
+            npy_PyFile_CloseFile(py_file);
+            Py_DECREF(py_file);
+        }
     }
-    #endif
     else
     {
         PyObject* write_method = PyObject_GetAttrString(py_fileobj.ptr(),