Alexander Alekhin
43467a2ac7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-05-28 18:29:48 +00:00
Ahmed Ashour
f9564e053d
java: test: use assertNotNull and assertFalse
2019-05-24 10:45:09 +02:00
Dmitry Kurtaev
4c2100e02c
Merge pull request #14266 from dkurt:fix_qrcode_decode_java
...
* Fix decode and detectAndDecode Java wrappers for QRCodeDetector
* revert changes in objdetect
* java: fix wrapping of std::string type
2019-04-05 17:15:51 +03:00
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
Maksim Shabunin
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
