Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-12-24 16:35:47 +00:00
parent 9777fbacf6 655d381ef3
commit 217fea9667
26 changed files with 804 additions and 377 deletions
@@ -372,6 +372,9 @@ struct IsRepresentableAsMatDataType<T, typename VoidType<typename cv::DataType<T
 {
 };

+// https://github.com/opencv/opencv/issues/20930
+template <> struct IsRepresentableAsMatDataType<cv::RotatedRect, void> : FalseType {};
+
 } // namespace traits

 template <typename Tp>