create homogeneous affine matrix when constructing from 4x3 cv::Mat

70e6391f · André Mewes · Vladislav Sovrasov · 04573615 · 70e6391f
Commit 70e6391f authored Apr 13, 2017 by André Mewes Committed by Vladislav Sovrasov May 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

affine.hpp modules/core/include/opencv2/core/affine.hpp +5 -3

No files found.
--- a/modules/core/include/opencv2/core/affine.hpp
+++ b/modules/core/include/opencv2/core/affine.hpp
@@ -213,11 +213,13 @@ cv::Affine3<T>::Affine3(const cv::Mat& data, const Vec3& t)
    {
        rotation(data(Rect(0, 0, 3, 3)));
        translation(data(Rect(3, 0, 1, 3)));
-        return;
+    }
+    else
+    {
+        rotation(data);
+        translation(t);
    }

-    rotation(data);
-    translation(t);
    matrix.val[12] = matrix.val[13] = matrix.val[14] = 0;
    matrix.val[15] = 1;
 }