Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed more warnings

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@933 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-08-15 08:43:04 +00:00
parent cb731fb0d1
commit 51f4f26300
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Tools/Decimater/ModHausdorffT.cc
View File

@@ -94,7 +94,7 @@ distPointTriangleSquared( const Point& _p,
Point v0p = _p - _v0;
Point t = v0p % n;
double s01, s02, s12;
typename Point::value_type s01, s02, s12;
const double a = (t | v0v2) * -invD;
const double b = (t | v0v1) * invD;

14
src/OpenMesh/Tools/Decimater/ModRoundnessT.hh
View File

@@ -125,7 +125,7 @@ class ModRoundnessT : public ModBaseT<MeshT>
typename Mesh::FaceHandle fhC, fhB;
Vec3f B,C;
if ( min_r_ < 0.0 ) // continues mode
if ( min_r_ < 0.0f ) // continues mode
{
C = vector_cast<Vec3f>(Base::mesh().point( Base::mesh().to_vertex_handle(*voh_it)));
fhC = Base::mesh().face_handle( *voh_it );
@@ -196,17 +196,17 @@ public: // specific methods
Vec3f A,B,C;
A = Vec3f( 0, 0, 0);
B = Vec3f( 2*cos(_angle), 0, 0);
C = Vec3f( cos(_angle), sin(_angle), 0);
A = Vec3f( 0.0f, 0.0f, 0.0f);
B = Vec3f( 2.0f * cos(_angle), 0.0f, 0.0f);
C = Vec3f( cos(_angle), sin(_angle), 0.0f);
double r1 = roundness(A,B,C);
_angle = float(0.5 * ( M_PI - _angle ));
A = Vec3f( 0, 0, 0);
B = Vec3f( 2*cos(_angle), 0, 0);
C = Vec3f( cos(_angle), sin(_angle), 0);
A = Vec3f( 0.0f, 0.0f, 0.0f);
B = Vec3f( 2.0f*cos(_angle), 0.0f, 0.0f);
C = Vec3f( cos(_angle), sin(_angle), 0.0f);
double r2 = roundness(A,B,C);

9
src/OpenMesh/Tools/Utils/StripifierT.cc
View File

@@ -75,7 +75,7 @@ StripifierT<Mesh>::
}
template <class Mesh>
unsigned int
size_t
StripifierT<Mesh>::
stripify()
{
@@ -107,7 +107,7 @@ build_strips()
{
Strip experiments[3];
typename Mesh::HalfedgeHandle h[3];
unsigned int best_idx, best_length, length;
size_t best_length,length , best_idx;
FaceHandles faces[3];
typename FaceHandles::iterator fh_it, fh_end;
typename Mesh::FaceIter f_it, f_end=mesh_.faces_end();
@@ -148,8 +148,9 @@ build_strips()
// build 3 strips, take best one
best_length = best_idx = 0;
for (unsigned int i=0; i<3; ++i)
best_length = 0;
best_idx = 0;
for (size_t i=0; i<3; ++i)
{
build_strip(h[i], experiments[i], faces[i]);
if ((length = experiments[i].size()) > best_length)

2
src/OpenMesh/Tools/Utils/StripifierT.hh
View File

@@ -92,7 +92,7 @@ public:
~StripifierT();
/// Compute triangle strips, returns number of strips
unsigned int stripify();
size_t stripify();
/// delete all strips
void clear() { Strips().swap(strips_); }