Merge pull request opencv#8686 from sovrasov:port_affine3_fix

mshabunin · mshabunin · commit 2a5a143f0fa6 · 2017-05-03T10:20:16.000Z
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,13 @@ cv::Affine3<T>::Affine3(const cv::Mat& data, const Vec3& t)`
`213`	`213`	`{`
`214`	`214`	`rotation(data(Rect(0, 0, 3, 3)));`
`215`	`215`	`translation(data(Rect(3, 0, 1, 3)));`
`216`		`- return;`
	`216`	`+ }`
	`217`	`+ else`
	`218`	`+ {`
	`219`	`+ rotation(data);`
	`220`	`+ translation(t);`
`217`	`221`	`}`
`218`	`222`
`219`		`- rotation(data);`
`220`		`- translation(t);`
`221`	`223`	`matrix.val[12] = matrix.val[13] = matrix.val[14] = 0;`
`222`	`224`	`matrix.val[15] = 1;`
`223`	`225`	`}`