From 965a1a051d54d562e0687fe0bbf74863e14b799b Mon Sep 17 00:00:00 2001 From: Pierre Kraemer Date: Mon, 26 Mar 2012 17:30:49 +0200 Subject: [PATCH] mini corrections (some warnings) --- include/Algo/Import/import2tables.h | 5 ++--- include/Algo/Import/import2tablesVolume.hpp | 4 ++-- include/Utils/textures.hpp | 2 +- src/Algo/Import/importPlyData.cpp | 2 +- src/Utils/Qt/qtSimple.cpp | 1 - 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/Algo/Import/import2tables.h b/include/Algo/Import/import2tables.h index 545747d7..35b8cb4e 100644 --- a/include/Algo/Import/import2tables.h +++ b/include/Algo/Import/import2tables.h @@ -184,10 +184,9 @@ public: inline unsigned int getEmbIdx(int i) { return m_emb[i]; } - bool importMesh(const std::string& filename, std::vector& attrNames, ImportVolumique::ImportType kind, float scaleFactor); - - bool importTet(const std::string& filename, std::vector& attrNames, float scaleFactor); + bool importMesh(const std::string& filename, std::vector& attrNames, ImportVolumique::ImportType kind, float scaleFactor = 1.0f); + bool importTet(const std::string& filename, std::vector& attrNames, float scaleFactor = 1.0f); MeshTablesVolume(typename PFP::MAP& map): m_map(map) diff --git a/include/Algo/Import/import2tablesVolume.hpp b/include/Algo/Import/import2tablesVolume.hpp index 9ffed880..1aa7ed5b 100644 --- a/include/Algo/Import/import2tablesVolume.hpp +++ b/include/Algo/Import/import2tablesVolume.hpp @@ -47,7 +47,7 @@ ImportVolumique::ImportType MeshTablesVolume::getFileType(const std::string } template -bool MeshTablesVolume::importMesh(const std::string& filename, std::vector& attrNames, ImportVolumique::ImportType kind, float scaleFactor=1.0f) +bool MeshTablesVolume::importMesh(const std::string& filename, std::vector& attrNames, ImportVolumique::ImportType kind, float scaleFactor) { if (kind == ImportVolumique::UNKNOWNVOLUME) kind = getFileType(filename); @@ -69,7 +69,7 @@ bool MeshTablesVolume::importMesh(const std::string& filename, std::vector< } template -bool MeshTablesVolume::importTet(const std::string& filename, std::vector& attrNames, float scaleFactor=1.0f) +bool MeshTablesVolume::importTet(const std::string& filename, std::vector& attrNames, float scaleFactor) { AttributeHandler positions = m_map.template getAttribute(VERTEX, "position") ; diff --git a/include/Utils/textures.hpp b/include/Utils/textures.hpp index 1ca3ddf4..f028bd18 100644 --- a/include/Utils/textures.hpp +++ b/include/Utils/textures.hpp @@ -863,7 +863,7 @@ Filter* Filter::createGaussian(int radius, double sigma) break; case 2: { - double tot=0.0; +// double tot=0.0; double coef = 1.0/(sig2*M_PI); for (int j=0; j< sz; ++j) for (int i=0; i< sz; ++i) diff --git a/src/Algo/Import/importPlyData.cpp b/src/Algo/Import/importPlyData.cpp index 8c73955f..d2822dd2 100644 --- a/src/Algo/Import/importPlyData.cpp +++ b/src/Algo/Import/importPlyData.cpp @@ -60,8 +60,8 @@ PlyImportData::PlyImportData(): flist(NULL), vert_other(NULL), face_other(NULL), - per_vertex_color_uint8(0), per_vertex_color_float32(0), + per_vertex_color_uint8(0), has_normals(0) { } diff --git a/src/Utils/Qt/qtSimple.cpp b/src/Utils/Qt/qtSimple.cpp index 852d85de..156d8c7d 100644 --- a/src/Utils/Qt/qtSimple.cpp +++ b/src/Utils/Qt/qtSimple.cpp @@ -112,7 +112,6 @@ SimpleQT::SimpleQT() : SimpleQT::SimpleQT(const SimpleQT& sqt): m_dock(NULL), - m_mat(m_mat), m_projection_matrix(m_mat.m_matrices[0]), m_modelView_matrix(m_mat.m_matrices[1]), m_transfo_matrix(m_mat.m_matrices[2]) -- GitLab