Alexander Alekhin f9cefc84a3 Merge pull request #15098 from RealJohnSmith:master

2019-08-01 16:35:07 +00:00

..

doc/pics

squashed #823

2015-04-24 21:58:14 +02:00

include/opencv2

removed C API in the following modules: photo, video, imgcodecs, videoio (#13060)

2018-11-09 00:52:09 +03:00

misc/java

java: disable highgui wrapped code

2018-01-13 02:12:39 +00:00

src

Fix cv::selectROI rectangle rendering issue

2019-07-19 14:07:09 +02:00

test

Restored 500ms delay in highgui test

2018-12-03 14:34:29 +03:00

CMakeLists.txt

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

2019-04-19 15:43:58 +03:00