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

2019-10-24 18:17:40 +00:00
parent 87a692b89e eabe679f78
commit 055ffc0425
61 changed files with 1438 additions and 394 deletions
@@ -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