Handle paths with a single moveto point

mdboom · mdboom · commit 4e5e6247a56c · 2016-01-26T08:26:25.000-05:00
diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py
@@ -217,6 +217,16 @@ def test_clipping_full():
     simplified = list(p.iter_segments(clip=[0, 0, 100, 100]))
     assert simplified == []
 
+    p = path.Path([[50, 40], [75, 65]], [1, 2])
+    simplified = list(p.iter_segments(clip=[0, 0, 100, 100]))
+    assert ([(list(x), y) for x, y in simplified] ==
+            [([50, 40], 1), ([75, 65], 2)])
+
+    p = path.Path([[50, 40]], [1])
+    simplified = list(p.iter_segments(clip=[0, 0, 100, 100]))
+    assert ([(list(x), y) for x, y in simplified] ==
+            [([50, 40], 1)])
+
 
 if __name__=='__main__':
     import nose
diff --git a/src/path_converters.h b/src/path_converters.h
@@ -402,6 +402,17 @@ class PathClipper : public EmbeddedQueue<2>
                 return code;
             }
 
+            if (m_moveto &&
+                m_lastX >= m_cliprect.x1 &&
+                m_lastX <= m_cliprect.x2 &&
+                m_lastY >= m_cliprect.y1 &&
+                m_lastY <= m_cliprect.y2) {
+                *x = m_lastX;
+                *y = m_lastY;
+                m_moveto = false;
+                return agg::path_cmd_move_to;
+            }
+
             return agg::path_cmd_stop;
         } else {
             // If not doing any clipping, just pass along the vertices
