Close clipped paths

mdboom · mdboom · commit 014f32d0ed54 · 2015-03-03T18:59:09.000-05:00
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -11,6 +11,7 @@
 from matplotlib import rcParams
 from matplotlib.colors import BoundaryNorm
 from matplotlib.cm import get_cmap
+from matplotlib import cm
 from matplotlib.colorbar import ColorbarBase
 
 
@@ -253,6 +254,33 @@ def test_colorbarbase():
     ColorbarBase(ax, plt.cm.bone)
 
 
+@image_comparison(
+    baseline_images=['colorbar_closed_patch'],
+    remove_text=True)
+def test_colorbar_closed_patch():
+    fig = plt.figure(figsize=(8,6))
+    ax1 = fig.add_axes([0.05, 0.85, 0.9, 0.1])
+    ax2 = fig.add_axes([0.05, 0.65, 0.9, 0.1])
+    ax3 = fig.add_axes([0.05, 0.45, 0.9, 0.1])
+    ax4 = fig.add_axes([0.05, 0.25, 0.9, 0.1])
+    ax5 = fig.add_axes([0.05, 0.05, 0.9, 0.1])
+
+    cmap = cm.jet
+    cmap.set_under('w')
+    cmap.set_over('w')
+
+    im = ax1.pcolormesh(np.linspace(0,10,16).reshape((4,4)))
+
+    plt.colorbar(im,cax=ax2,cmap=cmap,orientation='horizontal',
+                 extend='both',extendfrac=0.5)
+    plt.colorbar(im,cax=ax3,cmap=cmap,orientation='horizontal',
+                 extend='both',)
+    plt.colorbar(im,cax=ax4,cmap=cmap,orientation='horizontal',
+                 extend='both',extendrect=True)
+    plt.colorbar(im,cax=ax5,cmap=cmap,orientation='horizontal',
+                 extend='neither')
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
@@ -206,7 +206,7 @@ def test_clipping_of_log():
     # 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 ])
+    assert np.allclose(tcodes, [ M, M, L, L, L, C ])
 
 
 class NonAffineForTest(mtrans.Transform):
diff --git a/src/path_converters.h b/src/path_converters.h
@@ -253,6 +253,7 @@ class PathClipper
     double m_nextX;
     double m_nextY;
     bool m_has_next;
+    bool m_end_poly;
     double m_initX;
     double m_initY;
     bool m_has_init;
@@ -265,6 +266,7 @@ class PathClipper
           m_cliprect(-1.0, -1.0, width + 1.0, height + 1.0),
           m_moveto(true),
           m_has_next(false),
+          m_end_poly(false),
           m_has_init(false),
           m_broke_path(false)
     {
@@ -277,6 +279,7 @@ class PathClipper
           m_cliprect(rect),
           m_moveto(true),
           m_has_next(false),
+          m_end_poly(false),
           m_has_init(false),
           m_broke_path(false)
     {
@@ -300,6 +303,11 @@ class PathClipper
         if (m_do_clipping) {
             /* This is the slow path where we actually do clipping */
 
+            if (m_end_poly) {
+                m_end_poly = false;
+                return (agg::path_cmd_end_poly | agg::path_flags_close);
+            }
+
             if (m_has_next) {
                 m_has_next = false;
                 *x = m_nextX;
@@ -313,6 +321,7 @@ class PathClipper
                         *x = m_initX;
                         *y = m_initY;
                         code = agg::path_cmd_line_to;
+                        m_end_poly = true;
                     } else {
                         continue;
                     }
