Rostislav Vasilikhin da7e1cfb49 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		2018-09-06 13:28:24 +03:00
..
doc/pics	Removed Sphinx documentation files	2014-12-26 19:12:19 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-08-20 19:30:18 +03:00
misc/java/test	Merge pull request #12279 from savuor:cvtcolor_bgr2gray_8u_15bits	2018-09-06 13:28:24 +03:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-08-07 20:12:10 +03:00
test	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
CMakeLists.txt	Merge pull request #9466 from huningxin:js	2017-09-25 16:52:07 +03:00