diff --git a/vcg/complex/algorithms/clean.h b/vcg/complex/algorithms/clean.h index 25493000..5f7cdbef 100644 --- a/vcg/complex/algorithms/clean.h +++ b/vcg/complex/algorithms/clean.h @@ -1369,7 +1369,7 @@ public: count = 0; ScalarType NormalThrRad = math::ToRad(normalThresholdDeg); - ScalarType eps = 0.0001; // this epsilon value is in absolute value. It is a distance from edge in baricentric coords. + ScalarType eps = ScalarType(0.0001); // this epsilon value is in absolute value. It is a distance from edge in baricentric coords. //detection stage for(FaceIterator fi=m.face.begin();fi!= m.face.end();++fi ) if(!(*fi).IsV()) { Point3 NN = vcg::TriangleNormal((*fi)).Normalize(); diff --git a/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h b/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h index e1edbfba..072de7da 100644 --- a/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h +++ b/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric.h @@ -179,7 +179,7 @@ public: this->optimalPos = newPos; } - void Execute(TriMeshType &m, BaseParameterClass */*_pp*/) + void Execute(TriMeshType &m, BaseParameterClass * /*_pp*/) { CoordType newPos = this->optimalPos; QH::Qd(this->pos.V(1))+=QH::Qd(this->pos.V(0)); // v0 is deleted and v1 take the new position diff --git a/vcg/math/gen_normal.h b/vcg/math/gen_normal.h index ad5e71aa..3e9968c4 100644 --- a/vcg/math/gen_normal.h +++ b/vcg/math/gen_normal.h @@ -92,7 +92,7 @@ static void UniformCone(int vn, std::vector > &NN, ScalarTyp printf("----------AngleRad %f Angledeg %f ratio %f vn %i vn2 %i \n",AngleRad,math::ToDeg(AngleRad),Ratio,vn,int(vn/Ratio)); Fibonacci(vn/Ratio,NNT); - printf("asked %i got %i (expecting %i instead of %i)\n", int(vn/Ratio), NNT.size(), int(NNT.size()*Ratio), vn); + printf("asked %i got %i (expecting %i instead of %i)\n", int(vn/Ratio), int(NNT.size()), int(NNT.size()*Ratio), vn); typename std::vector >::iterator vi; ScalarType cosAngle = cos(AngleRad); diff --git a/wrap/io_trimesh/export_vrml.h b/wrap/io_trimesh/export_vrml.h index 613c2956..b8ee4244 100644 --- a/wrap/io_trimesh/export_vrml.h +++ b/wrap/io_trimesh/export_vrml.h @@ -65,7 +65,7 @@ namespace vcg { typedef typename SaveMeshType::FaceIterator FaceIterator; ///Standard call for saving a mesh - static int Save(SaveMeshType &m, const char * filename, const int &mask, CallBackPos */*cb=0*/) + static int Save(SaveMeshType &m, const char * filename, const int &mask, CallBackPos * /*cb=0*/) { FILE *fp; fp = fopen(filename,"wb"); diff --git a/wrap/io_trimesh/import_ctm.h b/wrap/io_trimesh/import_ctm.h index 540299a8..dfdde634 100644 --- a/wrap/io_trimesh/import_ctm.h +++ b/wrap/io_trimesh/import_ctm.h @@ -87,7 +87,7 @@ static const char* ErrorMsg(int error) }; -static int Open( OpenMeshType &m, const char * filename, int &loadmask, CallBackPos */*cb*/=0) +static int Open( OpenMeshType &m, const char * filename, int &loadmask, CallBackPos * /*cb*/=0) { CTMcontext context; diff --git a/wrap/io_trimesh/import_nvm.h b/wrap/io_trimesh/import_nvm.h index bebe7c36..c9e8fe22 100644 --- a/wrap/io_trimesh/import_nvm.h +++ b/wrap/io_trimesh/import_nvm.h @@ -154,7 +154,7 @@ static int Open( OpenMeshType &m, std::vector > & shots, shots[i].Intrinsics.FocalMm = f/100.0f; shots[i].Intrinsics.k[0] = 0.0;//k1; To be uncommented when distortion is taken into account reliably shots[i].Intrinsics.k[1] = 0.0;//k2; - shots[i].Intrinsics.PixelSizeMm = vcg::Point2(0.01,0.01); + shots[i].Intrinsics.PixelSizeMm = vcg::Point2(ScalarType(0.01), ScalarType(0.01)); QImageReader sizeImg(QString::fromStdString(image_filenames[i])); QSize size=sizeImg.size(); shots[i].Intrinsics.ViewportPx = vcg::Point2i(size.width(),size.height());