Ver código fonte

fixed bug in remove_duplicate_vertices for windows

Former-commit-id: 392f4fc4415fd7a9ef404e1d1fdbb734afb99c2d
Alec Jacobson (jalec 12 anos atrás
pai
commit
67944859f5
2 arquivos alterados com 6 adições e 8 exclusões
  1. 1 1
      VERSION.txt
  2. 5 7
      include/igl/remove_duplicate_vertices.cpp

+ 1 - 1
VERSION.txt

@@ -3,4 +3,4 @@
 # Anyone may increment Minor to indicate a small change.
 # Major indicates a large change or large number of changes (upload to website)
 # World indicates a substantial change or release
-0.1.8
+0.2.0

+ 5 - 7
include/igl/remove_duplicate_vertices.cpp

@@ -56,15 +56,13 @@ IGL_INLINE void igl::remove_duplicate_vertices(
       (&VectorXi::operator())), &SVJ)).eval();
 #else
   // Why doesn't the above compile on windows?
-#define __STR2__(x) #x
-#define __STR1__(x) __STR2__(x)
-#define __LOC__ __FILE__ "("__STR1__(__LINE__)") : Warning Msg: "
-#pragma message(__LOC__"Using untested Windows-only code")
-  // This needs to be tested.
   SF.resize(F.rows(),F.cols());
-  for(int f = 0;f<SF.size();f++)
+  for(int f = 0;f<F.rows();f++)
   {
-	  SF(f) = SVJ(f);
+    for(int c = 0;c<F.cols();c++)
+    {
+      SF(f,c) = SVJ(F(f,c));
+    }
   }
 #endif
 }