Merge pull request opencv#8574 from elmewo:fix-affine-constructor

alalek · web-flow · commit 91a6940930e5 · 2017-04-25T19:04:51.000+03:00
fix creation homogeneous affine matrix when constructing from 4x3 cv::Mat
diff --git a/modules/core/include/opencv2/core/affine.hpp b/modules/core/include/opencv2/core/affine.hpp
@@ -203,11 +203,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -203,11 +203,13 @@ cv::Affine3<T>::Affine3(const cv::Mat& data, const Vec3& t)`
`203`	`203`	`{`
`204`	`204`	`rotation(data(Rect(0, 0, 3, 3)));`
`205`	`205`	`translation(data(Rect(3, 0, 1, 3)));`
`206`		`- return;`
	`206`	`+ }`
	`207`	`+ else`
	`208`	`+ {`
	`209`	`+ rotation(data);`
	`210`	`+ translation(t);`
`207`	`211`	`}`
`208`	`212`
`209`		`- rotation(data);`
`210`		`- translation(t);`
`211`	`213`	`matrix.val[12] = matrix.val[13] = matrix.val[14] = 0;`
`212`	`214`	`matrix.val[15] = 1;`
`213`	`215`	`}`