diff --git a/include/Algo/Import/import2tables.h b/include/Algo/Import/import2tables.h index 545747d78d5a3756a1c94277b3fe8e4133168651..35b8cb4e62da35dd30a7ed39b50722ca5aeb2b4c 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 9ffed880fe7ed1c21945a095481cecef45891d4e..1aa7ed5b3e7775dd8f02438a1b6d505471095d4a 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 1ca3ddf4abf43554c3584a249f8b34de9fc4ae60..f028bd18870b6db7fb14bf7e2773e42f4750e8e8 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 8c73955f8dfeaf8f4ccbba4f7691805b9a616840..d2822dd27ea3b1dd001cc27507548add8a7bb941 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 852d85de9a9b0256cd256c9e78f72f023724d0f8..156d8c7df63d244911e643e029a208aac48419e8 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])