Commit c40a4912 authored by Sylvain Thery's avatar Sylvain Thery

remove some warnings

parent 66ee2706
......@@ -169,7 +169,6 @@ void MyQT::cb_Open()
color = myMap.addAttribute<VEC3, VOLUME, MAP>("color");
TraversorCell<MAP, VOLUME> tra(myMap);
float maxV = 0.0f;
for (Dart d = tra.begin(); d != tra.end(); d = tra.next())
{
// float v = Algo::Geometry::tetrahedronVolume<PFP>(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<PFP>(myMap,v,position);
// Vertex v(myMap.begin());
// VEC3 p = Algo::Volume::Geometry::vertexNeighborhoodCentroid<PFP>(myMap,v,position);
Vol w(myMap.begin());
VEC3 q = Algo::Surface::Geometry::volumeCentroid<PFP>(myMap,w,position);
// Vol w(myMap.begin());
// VEC3 q = Algo::Surface::Geometry::volumeCentroid<PFP>(myMap,w,position);
ch.start();
float vol = Algo::Geometry::Parallel::totalVolume<PFP>(myMap, position);
......
......@@ -158,7 +158,7 @@ typename PFP::REAL totalVolume(typename PFP::MAP& map, const VertexAttribute<typ
// compute the sum of volumes
typename PFP::REAL total(0);
for (unsigned int i=0; i< CGoGN::Parallel::NumberOfThreads-1; ++i )
for (int i=0; i< CGoGN::Parallel::NumberOfThreads-1; ++i )
total += vols[i];
return total;
......
......@@ -57,7 +57,7 @@ Vector<DIM, T>::Vector(typename std::initializer_list<T> args)
m_data[i] = *iter;
// finish with 0 if necessary
for (int j=i;j<DIM;++j)
for (unsigned int j=i;j<DIM;++j)
m_data[j] = 0;
}
......
......@@ -335,7 +335,7 @@ void foreach_attribute(ATTR& attribute, FUNC func, unsigned int nbth = NumberOfT
template<unsigned int ORBIT>
inline bool checkAttributeHandlerOrbit(const AttributeHandlerGen& att)
{
return (dynamic_cast<const AttributeHandlerOrbit<ORBIT>*>(&att)!=NULL) != NULL;
return dynamic_cast<const AttributeHandlerOrbit<ORBIT>*>(&att) != NULL;
}
} // namespace CGoGN
......
......@@ -271,7 +271,7 @@ void AttributeContainer::compact(std::vector<unsigned int>& 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);
......
......@@ -55,8 +55,8 @@ std::vector<GenericMap*>* GenericMap::s_instances=NULL;
GenericMap::GenericMap():
m_manipulator(NULL),
m_nextMarkerId(0)
m_nextMarkerId(0),
m_manipulator(NULL)
{
if(m_attributes_registry_map == NULL)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment