added Affine3: 3x4 input Mat support

a76a34d2 · Anatoly Baksheev · 3e071491 · a76a34d2
Commit a76a34d2 authored Jan 02, 2014 by Anatoly Baksheev
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

affine.hpp modules/core/include/opencv2/core/affine.hpp +6 -0

No files found.
--- a/modules/core/include/opencv2/core/affine.hpp
+++ b/modules/core/include/opencv2/core/affine.hpp
@@ -179,6 +179,12 @@ cv::Affine3<T>::Affine3(const cv::Mat& data, const Vec3& t)
        data.copyTo(matrix);
        return;
    }
+    else if (data.cols == 4 && data.rows == 3)
+    {
+        rotation(data(Rect(0, 0, 3, 3)));
+        translation(data(Rect(3, 0, 1, 3)));
+        return;
+    }

    rotation(data);
    translation(t);