Merge pull request #2915 from simongibbons/master

tacaswell · tacaswell · commit 655f3c0c6b5e · 2014-04-03T19:15:48.000-04:00
Consistency of the radius argument for Path.points_in_path
diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py
@@ -27,6 +27,13 @@ def test_point_in_path():
 
     assert np.all(path.contains_points(points) == [True, False])
 
+def test_contains_points_negative_radius():
+    path = Path.unit_circle()
+
+    points = [(0.0, 0.0), (1.25, 0.0), (0.9, 0.9)]
+    expected = [True, False, False]
+
+    assert np.all(path.contains_points(points, radius=-0.5) == expected)
 
 if __name__ == '__main__':
     import nose
diff --git a/src/_path.cpp b/src/_path.cpp
@@ -288,7 +288,7 @@ points_in_path(const void* const points, const size_t s0,
     no_nans_t no_nans_path(trans_path, true, path.has_curves());
     curve_t curved_path(no_nans_path);
     contour_t contoured_path(curved_path);
-    contoured_path.width(fabs(r));
+    contoured_path.width(r);
     point_in_path_impl(points, s0, s1, n, contoured_path, result);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ points_in_path(const void* const points, const size_t s0,`
`288`	`288`	`no_nans_t no_nans_path(trans_path, true, path.has_curves());`
`289`	`289`	`curve_t curved_path(no_nans_path);`
`290`	`290`	`contour_t contoured_path(curved_path);`
`291`		`- contoured_path.width(fabs(r));`
	`291`	`+ contoured_path.width(r);`
`292`	`292`	`point_in_path_impl(points, s0, s1, n, contoured_path, result);`
`293`	`293`	`}`
`294`	`294`