Skip to content

Fix for #3789, segfault in _tri #3797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jenshnielsen merged 1 commit into from
Nov 14, 2014
Merged

Fix for #3789, segfault in _tri #3797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/matplotlib/tri/_tri.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions src/numpy_cpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down