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

This commit is contained in:
Alexander Alekhin
2019-05-28 19:41:48 +03:00
committed by Alexander Alekhin
56 changed files with 2025 additions and 1195 deletions
@@ -22,12 +22,12 @@ public class CascadeClassifierTest extends OpenCVTestCase {
public void testCascadeClassifier() {
cc = new CascadeClassifier();
assertTrue(null != cc);
assertNotNull(cc);
}
public void testCascadeClassifierString() {
cc = new CascadeClassifier(OpenCVTestRunner.LBPCASCADE_FRONTALFACE_PATH);
assertTrue(null != cc);
assertNotNull(cc);
}
public void testDetectMultiScaleMatListOfRect() {
@@ -98,7 +98,7 @@ public class CascadeClassifierTest extends OpenCVTestCase {
public void testLoad() {
cc = new CascadeClassifier();
cc.load(OpenCVTestRunner.LBPCASCADE_FRONTALFACE_PATH);
assertTrue(!cc.empty());
assertFalse(cc.empty());
}
}