Commit bdd11d20 authored by Max Lyon's avatar Max Lyon
Browse files

Fixed Attribs of OpenVolumeMesh using non-existing functions in assertion.

git-svn-id: http://www.openvolumemesh.org/svnrepo/OpenVolumeMesh/trunk@249 66977474-1d4b-4f09-8fe9-267525286df2
parent d70168f4
...@@ -66,7 +66,7 @@ public: ...@@ -66,7 +66,7 @@ public:
// Vertices // Vertices
//================== //==================
const ColT& operator[](const VertexHandle& _h) const { const ColT& operator[](const VertexHandle& _h) const {
assert((unsigned int)_h.idx() < vcolor_prop_.size()); assert((unsigned int)_h.idx() < kernel_.n_vertices());
return vcolor_prop_[_h.idx()]; return vcolor_prop_[_h.idx()];
} }
...@@ -80,7 +80,7 @@ public: ...@@ -80,7 +80,7 @@ public:
// Edges // Edges
//================== //==================
const ColT& operator[](const EdgeHandle& _h) const { const ColT& operator[](const EdgeHandle& _h) const {
assert((unsigned int)_h.idx() < ecolor_prop_.size()); assert((unsigned int)_h.idx() < kernel_.n_edges());
return ecolor_prop_[_h.idx()]; return ecolor_prop_[_h.idx()];
} }
...@@ -94,7 +94,7 @@ public: ...@@ -94,7 +94,7 @@ public:
// Half-Edges // Half-Edges
//================== //==================
const ColT& operator[](const HalfEdgeHandle& _h) const { const ColT& operator[](const HalfEdgeHandle& _h) const {
assert((unsigned int)_h.idx() < hecolor_prop_.size()); assert((unsigned int)_h.idx() < kernel_.n_halfedges());
return hecolor_prop_[_h.idx()]; return hecolor_prop_[_h.idx()];
} }
...@@ -108,7 +108,7 @@ public: ...@@ -108,7 +108,7 @@ public:
// Faces // Faces
//================== //==================
const ColT& operator[](const FaceHandle& _h) const { const ColT& operator[](const FaceHandle& _h) const {
assert((unsigned int)_h.idx() < fcolor_prop_.size()); assert((unsigned int)_h.idx() < kernel_.n_faces());
return fcolor_prop_[_h.idx()]; return fcolor_prop_[_h.idx()];
} }
...@@ -122,7 +122,7 @@ public: ...@@ -122,7 +122,7 @@ public:
// Half-Faces // Half-Faces
//================== //==================
const ColT& operator[](const HalfFaceHandle& _h) const { const ColT& operator[](const HalfFaceHandle& _h) const {
assert((unsigned int)_h.idx() < hfcolor_prop_.size()); assert((unsigned int)_h.idx() < kernel_.n_halffaces());
return hfcolor_prop_[_h.idx()]; return hfcolor_prop_[_h.idx()];
} }
...@@ -136,7 +136,7 @@ public: ...@@ -136,7 +136,7 @@ public:
// Cells // Cells
//================== //==================
const ColT& operator[](const CellHandle& _h) const { const ColT& operator[](const CellHandle& _h) const {
assert((unsigned int)_h.idx() < ccolor_prop_.size()); assert((unsigned int)_h.idx() < kernel_.n_cells());
return ccolor_prop_[_h.idx()]; return ccolor_prop_[_h.idx()];
} }
......
...@@ -66,7 +66,7 @@ public: ...@@ -66,7 +66,7 @@ public:
// Vertices // Vertices
//================== //==================
const TexCoordT& operator[](const VertexHandle& _h) const { const TexCoordT& operator[](const VertexHandle& _h) const {
assert((unsigned int)_h.idx() < vtexcoord_prop_.size()); assert((unsigned int)_h.idx() < kernel_.n_vertices());
return vtexcoord_prop_[_h.idx()]; return vtexcoord_prop_[_h.idx()];
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment