Merge branch 'master' of github.com:kyamagu/mexopencv

kyamagu · Oct 20, 2014 · 0ba8ef4 · 0ba8ef4
2 parents 42993bb + 5811334
commit 0ba8ef4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/+cv/solvePnP.cpp b/src/+cv/solvePnP.cpp
@@ -46,9 +46,9 @@ void mexFunction( int nlhs, mxArray *plhs[],
         if (key=="UseExtrinsicGuess")
             useExtrinsicGuess = rhs[i+1].toBool();
         else if (key=="Rvec")
-            rvec = rhs[i+1].toMat(CV_32F);
+            rvec = rhs[i+1].toMat(CV_64F);
         else if (key=="Tvec")
-            tvec = rhs[i+1].toMat(CV_32F);
+            tvec = rhs[i+1].toMat(CV_64F);
         else if (key=="Flags")
             flags = PnPMethod[rhs[i+1].toString()];
         else

diff --git a/src/+cv/solvePnPRansac.cpp b/src/+cv/solvePnPRansac.cpp
@@ -55,9 +55,9 @@ void mexFunction( int nlhs, mxArray *plhs[],
         else if (key=="MinInliersCount")
             minInliersCount = rhs[i+1].toInt();
         else if (key=="Rvec")
-            rvec = rhs[i+1].toMat(CV_32F);
+            rvec = rhs[i+1].toMat(CV_64F);
         else if (key=="Tvec")
-            tvec = rhs[i+1].toMat(CV_32F);
+            tvec = rhs[i+1].toMat(CV_64F);
         else if (key=="Flags")
             flags = PnPMethod[rhs[i+1].toString()];
         else