Merge pull request #12279 from savuor:cvtcolor_bgr2gray_8u_15bits

* bgr2gray 8u fixed to be in conformance with IPP code

* coefficients fixed so their sum is 32768

* java test for CascadeDetect fixed: equalizeHist added
This commit is contained in:
Rostislav Vasilikhin
2018-09-06 13:28:24 +03:00
committed by Alexander Alekhin
parent 43b64140ae
commit da7e1cfb49
4 changed files with 16 additions and 6 deletions
@@ -36,9 +36,9 @@ public class CascadeClassifierTest extends OpenCVTestCase {
Mat greyLena = new Mat();
Imgproc.cvtColor(rgbLena, greyLena, Imgproc.COLOR_RGB2GRAY);
Imgproc.equalizeHist(greyLena, greyLena);
// TODO: doesn't detect with 1.1 scale
cc.detectMultiScale(greyLena, faces, 1.09, 3, Objdetect.CASCADE_SCALE_IMAGE, new Size(30, 30), new Size());
cc.detectMultiScale(greyLena, faces, 1.1, 3, Objdetect.CASCADE_SCALE_IMAGE, new Size(30, 30), new Size());
assertEquals(1, faces.total());
}