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

2021-12-03 12:32:49 +00:00
parent c3910807c5 35ff9af6ce
commit 8b4fa2605e
89 changed files with 1116 additions and 542 deletions
@@ -474,7 +474,7 @@ static void test_threshold( const Mat& _src, Mat& _dst,
        }
        break;
    default:
-        assert(0);
+        CV_Assert(0);
    }
 }