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

This commit is contained in:
Alexander Alekhin committed 2019-10-24 18:21:19 +00:00
commit 055ffc0425
61 files changed
+1438 -394

No files matched your search

+1 -1
View File
@@ -96,7 +96,7 @@ class SamplesFindFile(NewOpenCVTests):
def test_MissingFileException(self):
try:
res = cv.samples.findFile('non_existed.file', True)
_res = cv.samples.findFile('non_existed.file', True)
self.assertEqual("Dead code", 0)
except cv.error as _e:
pass