Browse Source

Merge commit '0a7cf8a98e9da6ef8a8a7ea64ce87d8247776631 [formerly 5bbb692ac1dae79549793a52b460c7674ed9c42a]'

Former-commit-id: a1d1a13174caf40d91a73c42cfcec44d46af8e45
Stefan Brugger 10 years ago
parent
commit
d2e4bb65ce
2 changed files with 4 additions and 4 deletions
  1. 0 1
      include/igl/procrustes.cpp
  2. 4 3
      include/igl/procrustes.h

+ 0 - 1
include/igl/procrustes.cpp

@@ -114,7 +114,6 @@ IGL_INLINE void igl::procrustes(
     Eigen::PlainObjectBase<DerivedR>& R,
     Eigen::PlainObjectBase<DerivedT>& t)
 {
-  double scale;
   procrustes(X,Y,false,false,R,t);
 }
 

+ 4 - 3
include/igl/procrustes.h

@@ -78,13 +78,14 @@ namespace igl
   //   igl::procrustes(X,Y,true,false,T);
   //   MatrixXd Xprime = (X * T.linear()).rowwise() + T.translation().transpose();
   template <
-    typename DerivedV, 
+    typename DerivedX, 
+    typename DerivedY, 
     typename Scalar, 
     int DIM, 
     int TType>
   IGL_INLINE void procrustes(
-    const Eigen::PlainObjectBase<DerivedV>& X,
-    const Eigen::PlainObjectBase<DerivedV>& Y,
+    const Eigen::PlainObjectBase<DerivedX>& X,
+    const Eigen::PlainObjectBase<DerivedY>& Y,
     bool includeScaling,
     bool includeReflections,
     Eigen::Transform<Scalar,DIM,TType>& T);