Commit 9ca759fb authored by Jan Möbius's avatar Jan Möbius

Fixed various cppcheck warnings

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@934 fdac6126-5c0c-442c-9429-916003d36597
parent 51f4f263
......@@ -9,13 +9,12 @@ template <typename Mesh>
bool
fill_props( Mesh& _m, OpenMesh::VPropHandleT<float> _ph, bool _check=false)
{
float v;
static float a[9] = { 1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f, 9.9f };
for(typename Mesh::VertexIter it=_m.vertices_begin();
it != _m.vertices_end(); ++it)
{
v = a[it->idx()%9];
const float v = a[it->idx()%9];
if ( _check && !(_m.property( _ph, it ) == v) )
return false;
else
......@@ -29,13 +28,12 @@ template <typename Mesh>
bool
fill_props( Mesh& _m, OpenMesh::EPropHandleT<bool> _ph, bool _check=false )
{
size_t n;
bool v;
for( typename Mesh::EdgeIter it=_m.edges_begin();
it != _m.edges_end(); ++it)
{
n = it->idx();
v = ((n&(n-1))==0); // true for 0,1,2,4,8,..
const size_t n = it->idx();
const bool v = ((n&(n-1))==0); // true for 0,1,2,4,8,..
if (_check && _m.property( _ph, it ) != v)
{
......@@ -58,12 +56,12 @@ template <typename Mesh>
bool
fill_props(Mesh& _m, OpenMesh::FPropHandleT<std::string> _ph, bool _check=false)
{
int n;
for( typename Mesh::FaceIter it=_m.faces_begin();
it != _m.faces_end(); ++it)
{
n = it->idx();
_m.property( _ph, it ) = int2roman(++n);
const int n = ++(it->idx());
_m.property( _ph, it ) = int2roman(n);
}
return true;
}
......@@ -73,7 +71,6 @@ template <typename Mesh, typename T>
bool
fill_props( Mesh& _m, OpenMesh::HPropHandleT<T> _ph, bool _check=false)
{
int n;
T v;
static float a[9] = { 1.1f, 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f, 9.9f };
static float b[9] = { 2.2f, 3.3f, 4.4f, 5.5f, 6.6f, 7.7f, 8.8f, 9.9f, 1.1f };
......@@ -85,7 +82,7 @@ fill_props( Mesh& _m, OpenMesh::HPropHandleT<T> _ph, bool _check=false)
for( typename Mesh::HalfedgeIter it=_m.halfedges_begin();
it != _m.halfedges_end(); ++it)
{
n = it->idx();
const int n = it->idx();
v = it->idx()+1; // ival
v = values[n%9]; // dval
......@@ -107,10 +104,9 @@ template <typename Mesh, typename T>
bool
fill_props( Mesh& _m, OpenMesh::MPropHandleT<T> _ph, bool _check=false)
{
size_t idx;
for( typename Mesh::FaceIter it=_m.faces_begin(); it != _m.faces_end(); ++it)
{
idx = it->idx();
const size_t idx = it->idx();
if ( _check && _m.property( _ph )[int2roman(idx+1)] != idx )
return false;
else
......
......@@ -89,7 +89,6 @@ initialize()
typename Mesh::FaceVertexIter fv_it;
typename Mesh::VertexHandle vh0, vh1, vh2;
typedef Vec3d Vec3;
double a,b,c,d, area;
for (; f_it != f_end; ++f_it)
{
......@@ -108,17 +107,17 @@ initialize()
}
Vec3 n = (v1-v0) % (v2-v0);
area = n.norm();
double area = n.norm();
if (area > FLT_MIN)
{
n /= area;
area *= 0.5;
}
a = n[0];
b = n[1];
c = n[2];
d = -(vector_cast<Vec3>(Base::mesh().point(vh0))|n);
const double a = n[0];
const double b = n[1];
const double c = n[2];
const double d = -(vector_cast<Vec3>(Base::mesh().point(vh0))|n);
Quadricd q(a, b, c, d);
q *= area;
......
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