Skip to content

Merge 3.4#17539

Merged
alalek merged 16 commits intoopencv:masterfrom
alalek:merge-3.4
Jun 12, 2020
Merged

Merge 3.4#17539
alalek merged 16 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jun 12, 2020

#16955 from themechanicalcoder:text_recognition
#17143 from cyyever:detect_mkl_installed_by_nuget
#17341 from hunter-college-ossd-spr-2020:3.4-1
#17368 from themightyoarfish:cv2eigen-doc
#17504 from alalek:update_ffmpeg_3.4
#17511 from mshabunin:fix-kw-issues-34
#17536 from ilya-lavrenov:remove-error-listener
#17538 from alalek:dnn_openvino_2020.3.0

Previous "Merge 3.4": #17503

ci_branch=merge-3.4
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript

alalek and others added 16 commits June 8, 2020 21:03
* add text recognition sample

* fix pylint warning

* made changes according to the c++ example

* fix errors

* add text recognition sample

* update text detection sample
* Add documentation about usage of cv2eigen functions in eigen.hpp

* Fixed Doxygen syntax.

Co-authored-by: Alexander Smorkalov <smorkalov.a.m@gmail.com>
Added and Edited specific information to the "Installation in MacOS" OpenCV documentation.
Closes opencv#17340
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jun 12, 2020

👍

@alalek alalek merged commit 0cbaaba into opencv:master Jun 12, 2020
@alalek alalek mentioned this pull request Jun 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants