Merge branch 'master' of github.com:rflamary/POT

Author: rflamary

ot/lp/EMD_wrapper.cpp

@@ -18,8 +18,8 @@
 void EMD_wrap(int n1,int n2, double *X, double *Y,double *D, double *G, double *cost)  {
 // beware M and C anre strored in row major C style!!!
   int n, m, i,cur;
-  double  max,max_iter;
-
+  double  max;
+  int max_iter=10000;
 
     typedef FullBipartiteDigraph Digraph;
   DIGRAPH_TYPEDEFS(FullBipartiteDigraph);