opencv/modules
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
..
calib3d Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-22 19:31:31 +03:00
core Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-01 18:11:55 +03:00
dnn Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-04 18:09:24 +00:00
features2d Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-01-22 18:00:34 +00:00
flann Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-22 19:31:31 +03:00
gapi Merge pull request #14144 from alalek:issue_14143 2019-04-03 14:35:54 +00:00
highgui Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-06 11:43:16 +03:00
imgcodecs Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-04 18:09:24 +00:00
imgproc Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-26 18:56:54 +00:00
java Merge pull request #14266 from dkurt:fix_qrcode_decode_java 2019-04-05 17:15:51 +03:00
js Backport commits from 2019-03-13 13:32:44 +03:00
ml Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-15 22:42:57 +00:00
objdetect Merge pull request #14266 from dkurt:fix_qrcode_decode_java 2019-04-05 17:15:51 +03:00
photo Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-13 19:13:13 +00:00
python Merge pull request #14175 from paroj:copyto 2019-04-02 16:18:00 +00:00
stitching Merge pull request #13947 from JoeHowse:4.0.1-patches 2019-03-02 19:00:32 +03:00
ts Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-12-03 18:38:27 +03:00
video Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-11 19:20:22 +00:00
videoio Merge pull request #14156 from mshabunin:videowriter-bad-test 2019-03-29 17:52:22 +03:00
world Merge pull request #13422 from mshabunin:split-videoio-cmake 2018-12-26 15:50:20 +03:00
CMakeLists.txt cmake: allow providing list of extra modules paths 2018-02-01 19:02:02 +03:00