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

tacaswell · tacaswell · commit cd0921c858ad · 2016-02-22T15:28:16.000-05:00
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -23,6 +23,7 @@
 
 import numpy as np
 import tornado
+import datetime
 
 from matplotlib.backends import backend_agg
 from matplotlib.figure import Figure
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -852,7 +852,8 @@ def _resample(self, lutsize):
         """
         Return a new color map with *lutsize* entries.
         """
-        return ListedColormap(self.name, self.colors, lutsize)
+        colors = self(np.linspace(0, 1, lutsize))
+        return ListedColormap(colors, name=self.name)
 
 
 class Normalize(object):
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -18,6 +18,28 @@
                                            cleanup, knownfailureif)
 
 
+def test_resample():
+    """
+    Github issue #6025 pointed to incorrect ListedColormap._resample;
+    here we test the method for LinearSegmentedColormap as well.
+    """
+    n = 101
+    colorlist = np.empty((n, 4), float)
+    colorlist[:, 0] = np.linspace(0, 1, n)
+    colorlist[:, 1] = 0.2
+    colorlist[:, 2] = np.linspace(1, 0, n)
+    colorlist[:, 3] = 0.7
+    lsc = mcolors.LinearSegmentedColormap.from_list('lsc', colorlist)
+    lc = mcolors.ListedColormap(colorlist)
+    lsc3 = lsc._resample(3)
+    lc3 = lc._resample(3)
+    expected = np.array([[0.0, 0.2, 1.0, 0.7],
+                         [0.5, 0.2, 0.5, 0.7],
+                         [1.0, 0.2, 0.0, 0.7]], float)
+    assert_array_almost_equal(lsc3([0, 0.5, 1]), expected)
+    assert_array_almost_equal(lc3([0, 0.5, 1]), expected)
+
+
 def test_colormap_endian():
     """
     Github issue #1005: a bug in putmask caused erroneous
diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
@@ -208,10 +208,7 @@ def test_clipping_of_log():
                                  simplify=False)
 
     tpoints, tcodes = list(zip(*result))
-    # Because y coordinate -99 is outside the clip zone, the first
-    # line segment is effectively removed. That means that the closepoly
-    # operation must be replaced by a move to the first point.
-    assert np.allclose(tcodes, [M, M, L, L, L, C])
+    assert np.allclose(tcodes, [M, L, L, L, C])
 
 
 class NonAffineForTest(mtrans.Transform):
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -484,7 +484,7 @@ RendererAgg::draw_path(GCAgg &gc, PathIterator &path, agg::trans_affine &trans,
 
     transformed_path_t tpath(path, trans);
     nan_removed_t nan_removed(tpath, true, path.has_curves());
-    clipped_t clipped(nan_removed, clip, width, height);
+    clipped_t clipped(nan_removed, clip && !path.has_curves(), width, height);
     snapped_t snapped(clipped, gc.snap_mode, path.total_vertices(), snapping_linewidth);
     simplify_t simplified(snapped, simplify, path.simplify_threshold());
     curve_t curve(simplified);
@@ -1009,7 +1009,7 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc,
 
             transformed_path_t tpath(path, trans);
             nan_removed_t nan_removed(tpath, true, has_curves);
-            clipped_t clipped(nan_removed, do_clip, width, height);
+            clipped_t clipped(nan_removed, do_clip && !has_curves, width, height);
             snapped_t snapped(
                 clipped, gc.snap_mode, path.total_vertices(), points_to_pixels(gc.linewidth));
             if (has_curves) {
diff --git a/src/_path.h b/src/_path.h
@@ -885,7 +885,7 @@ void convert_path_to_polygons(PathIterator &path,
 
     transformed_path_t tpath(path, trans);
     nan_removal_t nan_removed(tpath, true, path.has_curves());
-    clipped_t clipped(nan_removed, do_clip, width, height);
+    clipped_t clipped(nan_removed, do_clip && !path.has_curves(), width, height);
     simplify_t simplified(clipped, simplify, path.simplify_threshold());
     curve_t curve(simplified);
 
@@ -950,7 +950,7 @@ void cleanup_path(PathIterator &path,
 
     transformed_path_t tpath(path, trans);
     nan_removal_t nan_removed(tpath, remove_nans, path.has_curves());
-    clipped_t clipped(nan_removed, do_clip, rect);
+    clipped_t clipped(nan_removed, do_clip && !path.has_curves(), rect);
     snapped_t snapped(clipped, snap_mode, path.total_vertices(), stroke_width);
     simplify_t simplified(snapped, do_simplify, path.simplify_threshold());
 
@@ -1156,7 +1156,7 @@ int convert_to_string(PathIterator &path,
 
     transformed_path_t tpath(path, trans);
     nan_removal_t nan_removed(tpath, true, path.has_curves());
-    clipped_t clipped(nan_removed, do_clip, clip_rect);
+    clipped_t clipped(nan_removed, do_clip && !path.has_curves(), clip_rect);
     simplify_t simplified(clipped, simplify, path.simplify_threshold());
 
     *buffersize = path.total_vertices() * (precision + 5) * 4;
diff --git a/src/path_cleanup.cpp b/src/path_cleanup.cpp
@@ -43,7 +43,7 @@ class PathCleanupIterator
         : m_transform(trans),
           m_transformed(m_path_iter, m_transform),
           m_nan_removed(m_transformed, remove_nans, m_path_iter.has_curves()),
-          m_clipped(m_nan_removed, do_clip, rect),
+          m_clipped(m_nan_removed, do_clip && !m_path_iter.has_curves(), rect),
           m_snapped(m_clipped, snap_mode, m_path_iter.total_vertices(), stroke_width),
           m_simplify(m_snapped,
                      do_simplify && m_path_iter.should_simplify(),
