compil visual 2013

Apps/Benches/bench_trav.cpp

@@ -58,7 +58,7 @@ int main()
 	ch.start();
 	// add position attribute on vertices and get handler on it
 	VertexAttribute<VEC3, MAP> position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
-	constexpr int nb = 100;
+	const int nb = 100;
 	Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, nb, nb, nb);
 	cubic.embedIntoGrid(position, 10.0f, 10.0f, 10.0f);
 	std::cout<< "construct grid in " << ch.elapsed()<< " ms"<< std::endl;

Apps/Tests/copyfrom.cpp

@@ -53,7 +53,7 @@ int main()
 
 	// add position attribute on vertices and get handler on it
 	VertexAttribute<VEC3, MAP> position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
-	constexpr int nb = 2;
+	const int nb = 2;
 	Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, nb, nb, nb);
 	cubic.embedIntoGrid(position, 10.0f, 10.0f, 10.0f);
 

Apps/Tests/loadSave.cpp

@@ -54,7 +54,7 @@ int main()
 
 	// add position attribute on vertices and get handler on it
 	VertexAttribute<VEC3, MAP> position = myMap.addAttribute<VEC3, VERTEX, MAP>("position");
-	constexpr int nb = 2;
+	const int nb = 2;
 	Algo::Volume::Tilings::Cubic::Grid<PFP> cubic(myMap, nb, nb, nb);
 	cubic.embedIntoGrid(position, 10.0f, 10.0f, 10.0f);
 

include/Algo/Decimation/approximator.hpp

@@ -69,9 +69,9 @@ Approximator<PFP,T,ORBIT>::~Approximator()
 //	std::cout << "Approximator<PFP,T,ORBIT>::~Approximator()" << std::endl ;
 	for (unsigned int i = 0 ; i < m_attrV.size() ; ++i)
 	{
-		this->m_map.template removeAttribute(m_approx[i]) ;
+		this->m_map.removeAttribute(m_approx[i]) ;
 		if(m_predictor)
-			this->m_map.template removeAttribute(m_detail[i]) ;
+			this->m_map.removeAttribute(m_detail[i]) ;
 	}
 }
 

include/Container/attributeMultiVectorBool.hpp

@@ -288,7 +288,7 @@ public:
 	*/
 	void overwrite(unsigned int src_b, unsigned int src_id, unsigned int dst_b, unsigned int dst_id)
 	{
-		bool b = m_tableData[src_b][src_id/32] & (1 << (src_id%32));
+		bool b = (m_tableData[src_b][src_id/32] & (1 << (src_id%32))) != 0;
 
 		unsigned int mask = 1 << (dst_id%32);
 

include/Utils/colorMaps.hpp

@@ -21,6 +21,7 @@
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/
+#include <algorithm>
 
 namespace CGoGN
 {

include/Utils/qem.hpp

@@ -22,6 +22,8 @@
  *                                                                              *
  *******************************************************************************/
 
+#include <cmath>
+
 namespace CGoGN {
 
 namespace Utils {
@@ -139,7 +141,11 @@ template <typename REAL>
 bool
 Quadric<REAL>::optimize(VEC4& v) const
 {
-	if (std::isnan(A(0,0)))
+#ifdef WIN32
+	if (A(0, 0) != A(0, 0))
+#else
+	if (std::isnan(A(0, 0)))
+#endif
 		return false ;
 
 	MATRIX44 A2(A) ;
@@ -286,7 +292,11 @@ template <typename REAL, unsigned int N>
 bool
 QuadricNd<REAL,N>::optimize(VECN& v) const
 {
-	if (std::isnan(A(0,0)))
+#ifdef WIN32
+	if (A(0, 0) != A(0, 0))
+#else
+	if (std::isnan(A(0, 0)))
+#endif
 		return false ;
 
 	Geom::Matrix<N,N,double> Ainv ;

src/Utils/GLSLShader.cpp

@@ -28,10 +28,12 @@
 #include <iostream>
 #include <fstream>
 #include <vector>
+#include <algorithm>
 #include "Utils/cgognStream.h"
 
 #include "glm/gtx/inverse_transpose.hpp"
 
+
 namespace CGoGN
 {
 

src/Utils/frameManipulator.cpp

@@ -840,14 +840,14 @@ float FrameManipulator::scaleFromMouse(int dx, int dy)
 	if (abs(dx) > abs(dy))
 	{
 		if (dx>0)
-			return 1.01;
-		return 0.99;
+			return 1.01f;
+		return 0.99f;
 	}
 	else
 	{
 		if (dy>0)
-			return 1.01;
-		return 0.99;
+			return 1.01f;
+		return 0.99f;
 	}
 }
 

src/Utils/pickables.cpp

@@ -262,7 +262,7 @@ Pickable* Pickable::pick(const std::vector<Pickable*>& picks,const Geom::Vec3f&
 			glm::vec4 IWglm = tr*ii;
 			Geom::Vec3f IW(IWglm[0]/IWglm[3],IWglm[1]/IWglm[3],IWglm[2]/IWglm[3]);
 			IW -= P;
-			float dist = IW.norm();
+			float dist = float(IW.norm());
 			if (dist < mdist)
 			{
 				res = *it;

src/Utils/text3d.cpp

@@ -27,6 +27,9 @@
 #include "Utils/svg.h"
 #include "Utils/gzstream.h"
 
+#include <algorithm>
+
+
 namespace CGoGN
 {