Merge pull request matplotlib#3797 from ianthomas23/3789_segfault

jenshnielsen · jenshnielsen · commit cae5a8e00aa0 · 2014-11-14T17:24:24.000Z
Fix for matplotlib#3789, segfault in _tri
diff --git a/lib/matplotlib/tri/_tri.cpp b/lib/matplotlib/tri/_tri.cpp
@@ -530,7 +530,8 @@ int Triangulation::get_triangle_point(const TriEdge& tri_edge) const
 bool Triangulation::is_masked(int tri) const
 {
     assert(tri >= 0 && tri < get_ntri() && "Triangle index out of bounds.");
-    return !_mask.empty() && _mask(tri);
+    const npy_bool* mask_ptr = reinterpret_cast<const npy_bool*>(_mask.data());
+    return !_mask.empty() && mask_ptr[tri];
 }
 
 void Triangulation::set_mask(const MaskArray& mask)
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -479,6 +479,12 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
         return size() == 0;
     }
 
+    // Do not use this for array_view<bool, ND>.  See comment near top of file.
+    const T *data() const
+    {
+        return (const T *)m_data;
+    }
+
     // Do not use this for array_view<bool, ND>.  See comment near top of file.
     T *data()
     {

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,8 @@ int Triangulation::get_triangle_point(const TriEdge& tri_edge) const`
`530`	`530`	`bool Triangulation::is_masked(int tri) const`
`531`	`531`	`{`
`532`	`532`	`assert(tri >= 0 && tri < get_ntri() && "Triangle index out of bounds.");`
`533`		`- return !_mask.empty() && _mask(tri);`
	`533`	`+ const npy_bool* mask_ptr = reinterpret_cast<const npy_bool*>(_mask.data());`
	`534`	`+ return !_mask.empty() && mask_ptr[tri];`
`534`	`535`	`}`
`535`	`536`
`536`	`537`	`void Triangulation::set_mask(const MaskArray& mask)`
Original file line number	Diff line number	Diff line change
`@@ -479,6 +479,12 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`479`	`479`	`return size() == 0;`
`480`	`480`	`}`
`481`	`481`
	`482`	`+ // Do not use this for array_view<bool, ND>. See comment near top of file.`
	`483`	`+ const T *data() const`
	`484`	`+ {`
	`485`	`+ return (const T *)m_data;`
	`486`	`+ }`
	`487`	`+`
`482`	`488`	`// Do not use this for array_view<bool, ND>. See comment near top of file.`
`483`	`489`	`T *data()`
`484`	`490`	`{`