From c40a49124afdbf1223357c2c0724271fab7dc873 Mon Sep 17 00:00:00 2001 From: Sylvain Thery Date: Wed, 30 Jul 2014 12:22:52 +0200 Subject: [PATCH] remove some warnings --- Apps/Examples/volumeExplorer.cpp | 9 ++++----- include/Algo/Geometry/volume.hpp | 2 +- include/Geometry/vector_gen.hpp | 2 +- include/Topology/generic/attributeHandler.h | 2 +- src/Container/attributeContainer.cpp | 2 +- src/Topology/generic/genericmap.cpp | 4 ++-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Apps/Examples/volumeExplorer.cpp b/Apps/Examples/volumeExplorer.cpp index cbb6952f..023213b3 100644 --- a/Apps/Examples/volumeExplorer.cpp +++ b/Apps/Examples/volumeExplorer.cpp @@ -169,7 +169,6 @@ void MyQT::cb_Open() color = myMap.addAttribute("color"); TraversorCell tra(myMap); - float maxV = 0.0f; for (Dart d = tra.begin(); d != tra.end(); d = tra.next()) { // float v = Algo::Geometry::tetrahedronVolume(myMap, d, position); @@ -503,11 +502,11 @@ int main(int argc, char **argv) Utils::Chrono ch; - Vertex v(myMap.begin()); - VEC3 p = Algo::Volume::Geometry::vertexNeighborhoodCentroid(myMap,v,position); +// Vertex v(myMap.begin()); +// VEC3 p = Algo::Volume::Geometry::vertexNeighborhoodCentroid(myMap,v,position); - Vol w(myMap.begin()); - VEC3 q = Algo::Surface::Geometry::volumeCentroid(myMap,w,position); +// Vol w(myMap.begin()); +// VEC3 q = Algo::Surface::Geometry::volumeCentroid(myMap,w,position); ch.start(); float vol = Algo::Geometry::Parallel::totalVolume(myMap, position); diff --git a/include/Algo/Geometry/volume.hpp b/include/Algo/Geometry/volume.hpp index 35321953..b97a9905 100644 --- a/include/Algo/Geometry/volume.hpp +++ b/include/Algo/Geometry/volume.hpp @@ -158,7 +158,7 @@ typename PFP::REAL totalVolume(typename PFP::MAP& map, const VertexAttribute::Vector(typename std::initializer_list args) m_data[i] = *iter; // finish with 0 if necessary - for (int j=i;j inline bool checkAttributeHandlerOrbit(const AttributeHandlerGen& att) { - return (dynamic_cast*>(&att)!=NULL) != NULL; + return dynamic_cast*>(&att) != NULL; } } // namespace CGoGN diff --git a/src/Container/attributeContainer.cpp b/src/Container/attributeContainer.cpp index c7547307..58309b39 100644 --- a/src/Container/attributeContainer.cpp +++ b/src/Container/attributeContainer.cpp @@ -271,7 +271,7 @@ void AttributeContainer::compact(std::vector& mapOldNew) } // free memory and resize - for (int i = m_holesBlocks.size() - 1; i > nbb; --i) + for (int i = m_holesBlocks.size() - 1; i > int(nbb); --i) delete m_holesBlocks[i]; m_holesBlocks.resize(nbb); diff --git a/src/Topology/generic/genericmap.cpp b/src/Topology/generic/genericmap.cpp index 8a62b2a3..abdcf98f 100644 --- a/src/Topology/generic/genericmap.cpp +++ b/src/Topology/generic/genericmap.cpp @@ -55,8 +55,8 @@ std::vector* GenericMap::s_instances=NULL; GenericMap::GenericMap(): - m_manipulator(NULL), - m_nextMarkerId(0) + m_nextMarkerId(0), + m_manipulator(NULL) { if(m_attributes_registry_map == NULL) { -- GitLab