platform/upstream/opencv.git
4 years agoMerge pull request #17540 from YashasSamaga:cuda4dnn-update-mish
Alexander Alekhin [Sun, 14 Jun 2020 11:08:53 +0000 (11:08 +0000)]
Merge pull request #17540 from YashasSamaga:cuda4dnn-update-mish

4 years agoimprove mish performance and accuracy
YashasSamaga [Sat, 13 Jun 2020 11:23:27 +0000 (16:53 +0530)]
improve mish performance and accuracy

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 12 Jun 2020 22:20:50 +0000 (22:20 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17536 from ilya-lavrenov:remove-error-listener
Alexander Alekhin [Fri, 12 Jun 2020 22:18:04 +0000 (22:18 +0000)]
Merge pull request #17536 from ilya-lavrenov:remove-error-listener

4 years agoMerge pull request #17538 from alalek:dnn_openvino_2020.3.0
Alexander Alekhin [Fri, 12 Jun 2020 21:24:34 +0000 (21:24 +0000)]
Merge pull request #17538 from alalek:dnn_openvino_2020.3.0

4 years agoRemoved error lisneter usage
Ilya Lavrenov [Fri, 12 Jun 2020 17:27:21 +0000 (20:27 +0300)]
Removed error lisneter usage

4 years agodnn: use OpenVINO 2020.3 defines
Alexander Alekhin [Tue, 7 Apr 2020 13:17:21 +0000 (16:17 +0300)]
dnn: use OpenVINO 2020.3 defines

4 years agoMerge pull request #17143 from cyyever:detect_mkl_installed_by_nuget
Alexander Alekhin [Fri, 12 Jun 2020 09:44:42 +0000 (09:44 +0000)]
Merge pull request #17143 from cyyever:detect_mkl_installed_by_nuget

4 years agoimprove the mkl search procedure
cyy [Sat, 29 Feb 2020 10:59:43 +0000 (18:59 +0800)]
improve the mkl search procedure

4 years agoMerge pull request #17341 from hunter-college-ossd-spr-2020:3.4-1
Alexander Alekhin [Fri, 12 Jun 2020 06:58:14 +0000 (06:58 +0000)]
Merge pull request #17341 from hunter-college-ossd-spr-2020:3.4-1

4 years agoMerge pull request #17528 from YashasSamaga:cuda4dnn-fix-tests43
Alexander Alekhin [Fri, 12 Jun 2020 06:55:34 +0000 (06:55 +0000)]
Merge pull request #17528 from YashasSamaga:cuda4dnn-fix-tests43

4 years agoAdded information to OpenCV documentation [MacOS]
Jessica Wong [Thu, 21 May 2020 12:36:19 +0000 (08:36 -0400)]
Added information to OpenCV documentation [MacOS]

Added and Edited specific information to the "Installation in MacOS" OpenCV documentation.
Closes #17340

4 years agoallow multiple inputs to resize, fix tests
YashasSamaga [Thu, 11 Jun 2020 14:01:48 +0000 (19:31 +0530)]
allow multiple inputs to resize, fix tests

4 years agoMerge pull request #17511 from mshabunin:fix-kw-issues-34
Alexander Alekhin [Wed, 10 Jun 2020 12:13:06 +0000 (12:13 +0000)]
Merge pull request #17511 from mshabunin:fix-kw-issues-34

4 years agoQRDetectMulti: refactored checkPoints method
Maksim Shabunin [Mon, 8 Jun 2020 13:39:23 +0000 (16:39 +0300)]
QRDetectMulti: refactored checkPoints method

4 years agodnn/NGraph: added nullptr checks
Maksim Shabunin [Mon, 8 Jun 2020 18:57:27 +0000 (21:57 +0300)]
dnn/NGraph: added nullptr checks

4 years agoMerge pull request #17368 from themightyoarfish:cv2eigen-doc
Rasmus [Wed, 10 Jun 2020 07:53:18 +0000 (09:53 +0200)]
Merge pull request #17368 from themightyoarfish:cv2eigen-doc

* Add documentation about usage of cv2eigen functions in eigen.hpp

* Fixed Doxygen syntax.

Co-authored-by: Alexander Smorkalov <smorkalov.a.m@gmail.com>
4 years agoMerge pull request #17492 from cyyever:fix_data_race
Alexander Alekhin [Wed, 10 Jun 2020 07:01:04 +0000 (07:01 +0000)]
Merge pull request #17492 from cyyever:fix_data_race

4 years agoMerge pull request #16955 from themechanicalcoder:text_recognition
Gourav Roy [Wed, 10 Jun 2020 06:53:18 +0000 (12:23 +0530)]
Merge pull request #16955 from themechanicalcoder:text_recognition

* add text recognition sample

* fix pylint warning

* made changes according to the c++ example

* fix errors

* add text recognition sample

* update text detection sample

4 years agoMerge pull request #17509 from mshabunin:fix-kw-issues
Alexander Alekhin [Tue, 9 Jun 2020 11:11:39 +0000 (11:11 +0000)]
Merge pull request #17509 from mshabunin:fix-kw-issues

4 years agoMerge pull request #17507 from alalek:update_ffmpeg_4.4
Alexander Alekhin [Tue, 9 Jun 2020 09:31:16 +0000 (09:31 +0000)]
Merge pull request #17507 from alalek:update_ffmpeg_4.4

4 years agoQRDetectMulti: refactored checkPoints method
Maksim Shabunin [Mon, 8 Jun 2020 13:39:23 +0000 (16:39 +0300)]
QRDetectMulti: refactored checkPoints method

4 years agodnn/NGraph: added nullptr checks
Maksim Shabunin [Mon, 8 Jun 2020 18:57:27 +0000 (21:57 +0300)]
dnn/NGraph: added nullptr checks

4 years agoMerge pull request #17504 from alalek:update_ffmpeg_3.4
Alexander Alekhin [Tue, 9 Jun 2020 07:51:59 +0000 (07:51 +0000)]
Merge pull request #17504 from alalek:update_ffmpeg_3.4

4 years agouse C++11 static variables as memory barrier
cyy [Tue, 9 Jun 2020 07:49:31 +0000 (15:49 +0800)]
use C++11 static variables as memory barrier

4 years agoffmpeg/4.4: update FFmpeg wrapper
Alexander Alekhin [Tue, 9 Jun 2020 02:54:52 +0000 (02:54 +0000)]
ffmpeg/4.4: update FFmpeg wrapper

- FFmpeg 4.2.3

4 years agoMerge pull request #17506 from alalek:update_version_4.4.0-pre
Alexander Alekhin [Tue, 9 Jun 2020 07:39:10 +0000 (07:39 +0000)]
Merge pull request #17506 from alalek:update_version_4.4.0-pre

4 years agopre: OpenCV 4.4.0 (version++)
Alexander Alekhin [Tue, 9 Jun 2020 02:27:13 +0000 (02:27 +0000)]
pre: OpenCV 4.4.0 (version++)

4 years agoffmpeg/3.4: update FFmpeg wrapper
Alexander Alekhin [Mon, 8 Jun 2020 21:03:05 +0000 (21:03 +0000)]
ffmpeg/3.4: update FFmpeg wrapper

- FFmpeg 3.4.7

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 8 Jun 2020 19:50:55 +0000 (19:50 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17501 from alalek:update_version_3.4.11-pre
Alexander Alekhin [Mon, 8 Jun 2020 19:35:34 +0000 (19:35 +0000)]
Merge pull request #17501 from alalek:update_version_3.4.11-pre

4 years agopre: OpenCV 3.4.11 (version++)
Alexander Alekhin [Mon, 8 Jun 2020 18:46:27 +0000 (18:46 +0000)]
pre: OpenCV 3.4.11 (version++)

4 years agoMerge pull request #17498 from alalek:update_tbb
Alexander Alekhin [Mon, 8 Jun 2020 18:38:56 +0000 (18:38 +0000)]
Merge pull request #17498 from alalek:update_tbb

4 years agoMerge pull request #17165 from komakai:objc-binding
Giles Payne [Mon, 8 Jun 2020 18:32:53 +0000 (03:32 +0900)]
Merge pull request #17165 from komakai:objc-binding

Objc binding

* Initial work on Objective-C wrapper

* Objective-C generator script; update manually generated wrappers

* Add Mat tests

* Core Tests

* Imgproc wrapper generation and tests

* Fixes for Imgcodecs wrapper

* Miscellaneous fixes. Swift build support

* Objective-C wrapper build/install

* Add Swift wrappers for videoio/objdetect/feature2d

* Framework build;iOS support

* Fix toArray functions;Use enum types whenever possible

* Use enum types where possible;prepare test build

* Update test

* Add test runner scripts for iOS and macOS

* Add test scripts and samples

* Build fixes

* Fix build (cmake 3.17.x compatibility)

* Fix warnings

* Fix enum name conflicting handling

* Add support for document generation with Jazzy

* Swift/Native fast accessor functions

* Add Objective-C wrapper for calib3d, dnn, ml, photo and video modules

* Remove IntOut/FloatOut/DoubleOut classes

* Fix iOS default test platform value

* Fix samples

* Revert default framework name to opencv2

* Add converter util functions

* Fix failing test

* Fix whitespace

* Add handling for deprecated methods;fix warnings;define __OPENCV_BUILD

* Suppress cmake warnings

* Reduce severity of "jazzy not found" log message

* Fix incorrect #include of compatibility header in ios.h

* Use explicit returns in subscript/get implementation

* Reduce minimum required cmake version to 3.15 for Objective-C/Swift binding

4 years agoMerge pull request #17497 from alalek:fix_ffmpeg_wrapper_build
Alexander Alekhin [Mon, 8 Jun 2020 18:07:08 +0000 (18:07 +0000)]
Merge pull request #17497 from alalek:fix_ffmpeg_wrapper_build

4 years ago3rdparty: update TBB 2020.1 => 2020.2
Alexander Alekhin [Mon, 8 Jun 2020 11:04:33 +0000 (11:04 +0000)]
3rdparty: update TBB 2020.1 => 2020.2

https://github.com/oneapi-src/oneTBB/releases/tag/v2020.2

4 years agovideoio: fix plugins build
Alexander Alekhin [Mon, 8 Jun 2020 09:17:13 +0000 (09:17 +0000)]
videoio: fix plugins build

4 years agoMerge pull request #17485 from sitic:stitching
Alexander Alekhin [Sat, 6 Jun 2020 19:37:11 +0000 (19:37 +0000)]
Merge pull request #17485 from sitic:stitching

4 years agoMerge pull request #17471 from asmorkalov:as/video_capability_check
Alexander Alekhin [Fri, 5 Jun 2020 19:54:41 +0000 (19:54 +0000)]
Merge pull request #17471 from asmorkalov:as/video_capability_check

4 years agoMerge pull request #17431 from mshabunin:support-vtk9
Maksim Shabunin [Fri, 5 Jun 2020 17:55:53 +0000 (20:55 +0300)]
Merge pull request #17431 from mshabunin:support-vtk9

* Added VTK 9 support

4 years agoFix '--help' of stitching_detailed.py sample
Jan Lebert [Fri, 5 Jun 2020 17:35:26 +0000 (19:35 +0200)]
Fix '--help' of stitching_detailed.py sample

Fixes the help for `--features`, previously listed all possible values as default value.

Also adds the default value to the help for two other arguments

4 years agoMerge pull request #17474 from komakai:ndk-side-by-side
Alexander Alekhin [Fri, 5 Jun 2020 10:37:48 +0000 (10:37 +0000)]
Merge pull request #17474 from komakai:ndk-side-by-side

4 years agoMerge pull request #17350 from AsyaPronina:gapi_ocv_stateful_kernel
Alexander Alekhin [Thu, 4 Jun 2020 21:51:22 +0000 (00:51 +0300)]
Merge pull request #17350 from AsyaPronina:gapi_ocv_stateful_kernel

Enable stateful kernels in G-API OCV Backend

4 years agoEnable stateful kernels in G-API OCV Backend
AsyaPronina [Thu, 4 Jun 2020 16:55:49 +0000 (19:55 +0300)]
Enable stateful kernels in G-API OCV Backend

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 4 Jun 2020 17:55:00 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17466 from alalek:build_opencv_winpack_dldt_2020.3.0
Alexander Alekhin [Thu, 4 Jun 2020 17:32:08 +0000 (17:32 +0000)]
Merge pull request #17466 from alalek:build_opencv_winpack_dldt_2020.3.0

4 years agoMerge pull request #17432 from tomoaki0705:automaticCC
Alexander Alekhin [Thu, 4 Jun 2020 17:10:04 +0000 (17:10 +0000)]
Merge pull request #17432 from tomoaki0705:automaticCC

4 years agoMerge pull request #17473 from f3rm4rf3r:fixingFourCCDocBrokenLink
Fernando Martin [Thu, 4 Jun 2020 17:07:54 +0000 (18:07 +0100)]
Merge pull request #17473 from f3rm4rf3r:fixingFourCCDocBrokenLink

* - Fixing broken URL to mp4ra website

* - Fixing broken URL to mp4ra website (in C videoio API)

4 years agoAdd handling for Android "NDK (Side by side)"
Giles Payne [Thu, 4 Jun 2020 12:07:30 +0000 (21:07 +0900)]
Add handling for Android "NDK (Side by side)"

4 years agoMerge pull request #17469 from l-bat:fix_virtual_try_on
Alexander Alekhin [Thu, 4 Jun 2020 10:32:30 +0000 (10:32 +0000)]
Merge pull request #17469 from l-bat:fix_virtual_try_on

4 years agoMerge pull request #17455 from mshabunin:check-count-non-zero
Alexander Alekhin [Thu, 4 Jun 2020 08:47:43 +0000 (08:47 +0000)]
Merge pull request #17455 from mshabunin:check-count-non-zero

4 years agoSkip some GAPI tests if VideoCapture is not capable to playback video.
Alexander Smorkalov [Thu, 4 Jun 2020 06:59:09 +0000 (09:59 +0300)]
Skip some GAPI tests if VideoCapture is not capable to playback video.

4 years agoFixed virtual try on sample
Liubov Batanina [Thu, 4 Jun 2020 06:36:52 +0000 (09:36 +0300)]
Fixed virtual try on sample

4 years agobuild: winpack_dldt with dldt 2020.3.0
Alexander Alekhin [Wed, 3 Jun 2020 23:46:08 +0000 (23:46 +0000)]
build: winpack_dldt with dldt 2020.3.0

https://github.com/openvinotoolkit/openvino/releases/tag/2020.3.0

4 years agoAdded countNonZero test for big arrays and disable IPP for some cases
Maksim Shabunin [Tue, 2 Jun 2020 14:53:30 +0000 (17:53 +0300)]
Added countNonZero test for big arrays and disable IPP for some cases

4 years agoMerge pull request #17369 from themightyoarfish:doc-essential-matrix-different-cameras
Alexander Alekhin [Wed, 3 Jun 2020 12:55:55 +0000 (12:55 +0000)]
Merge pull request #17369 from themightyoarfish:doc-essential-matrix-different-cameras

4 years agoMerge pull request #17430 from alalek:issue_17257
Alexander Alekhin [Tue, 2 Jun 2020 12:42:04 +0000 (12:42 +0000)]
Merge pull request #17430 from alalek:issue_17257

4 years agoMerge pull request #17447 from alalek:dnn_ie_extract_layers
Alexander Alekhin [Tue, 2 Jun 2020 12:40:06 +0000 (12:40 +0000)]
Merge pull request #17447 from alalek:dnn_ie_extract_layers

4 years agoAdd instructions for how to use findEssentialMat() when camera matrices are different
Rasmus Diederichsen [Mon, 25 May 2020 13:06:05 +0000 (15:06 +0200)]
Add instructions for how to use findEssentialMat() when camera matrices are different

4 years agodnn(ie): fix layers extraction
Alexander Alekhin [Mon, 1 Jun 2020 20:43:35 +0000 (20:43 +0000)]
dnn(ie): fix layers extraction

4 years agoselect the architecture based on nvcc result
Tomoaki Teshima [Mon, 1 Jun 2020 20:07:53 +0000 (05:07 +0900)]
select the architecture based on nvcc result
  * cache the result
  * DRY
  * brush up based on review

4 years agoMerge pull request #17438 from alalek:fix_eigen_builds
Alexander Alekhin [Mon, 1 Jun 2020 18:02:07 +0000 (18:02 +0000)]
Merge pull request #17438 from alalek:fix_eigen_builds

4 years agoMerge pull request #17417 from vpisarev:fix_fitellipse
Vadim Pisarevsky [Mon, 1 Jun 2020 18:01:20 +0000 (21:01 +0300)]
Merge pull request #17417 from vpisarev:fix_fitellipse

* improved fitEllipse and fitEllipseDirect accuracy in singular or close-to-singular cases (see issue #9923)

* scale points using double precision

* added normalization to fitEllipseAMS as well; fixed Java test case by raising the tolerance (it's unclear what is the correct result in this case).

* improved point perturbation a bit. make the code a little bit more clear

* trying to fix Java fitEllipseTest by slightly raising the tolerance threshold

* synchronized C++ version of Java's fitEllipse test

* removed trailing whitespaces

4 years agoMerge pull request #17424 from berak:dnn_sample_human_parsing
Alexander Alekhin [Mon, 1 Jun 2020 17:58:12 +0000 (17:58 +0000)]
Merge pull request #17424 from berak:dnn_sample_human_parsing

4 years agoMerge pull request #17436 from vpisarev:fix_python_io
Vadim Pisarevsky [Mon, 1 Jun 2020 11:33:09 +0000 (14:33 +0300)]
Merge pull request #17436 from vpisarev:fix_python_io

* fixed #17044
1. fixed Python part of the tutorial about using OpenCV XML-YAML-JSON I/O functionality from C++ and Python.
2. added startWriteStruct() and endWriteStruct() methods to FileStorage
3. modifed FileStorage::write() methods to make them work well inside sequences, not only mappings.

* try to fix the doc builder

* added Python regression test for FileStorage I/O API ([TODO] iterating through long sequences can be very slow)

* fixed yaml testing

4 years agoMerge pull request #17439 from alalek:fix_dnn_test_required_file
Alexander Alekhin [Sun, 31 May 2020 19:51:56 +0000 (19:51 +0000)]
Merge pull request #17439 from alalek:fix_dnn_test_required_file

4 years agodnn(test): file 'dnn/efficientdet-d0.pb' is optional
Alexander Alekhin [Sun, 31 May 2020 16:18:37 +0000 (16:18 +0000)]
dnn(test): file 'dnn/efficientdet-d0.pb' is optional

4 years agocore: fix builds with eigen helper header
Alexander Alekhin [Sun, 31 May 2020 15:22:03 +0000 (15:22 +0000)]
core: fix builds with eigen helper header

4 years agodnn: add a human parsing cpp sample
berak [Fri, 29 May 2020 08:41:05 +0000 (10:41 +0200)]
dnn: add a human parsing cpp sample

4 years agoMerge pull request #17420 from nosajthenitram:fix_cascadedetect_convert_bug_for_old_c...
Alexander Alekhin [Sat, 30 May 2020 17:34:20 +0000 (17:34 +0000)]
Merge pull request #17420 from nosajthenitram:fix_cascadedetect_convert_bug_for_old_cascade

4 years agoMerge pull request #17403 from wangmengHB:master
Meng Wang [Sat, 30 May 2020 17:33:17 +0000 (01:33 +0800)]
Merge pull request #17403 from wangmengHB:master

Fix Test Case: in latest version, window.cv is a promise instance that makes most test case failed.

* Fix Browser Test Case: In latest version, window.cv is a promise instance

In latest version of opencv.js, window.cv is promise instance.
So that most of the test cases is run failed.
This commit is to fix browser test case.

* Add comment for backward compatible

Add comments for backward compatible

4 years agoFixed cascadedetect convert from old cascade to new
Jason Martin [Fri, 29 May 2020 02:29:10 +0000 (21:29 -0500)]
Fixed cascadedetect convert from old cascade to new

4 years agovideoio(ffmpeg): fix handling of AVERROR_EOF
Alexander Alekhin [Fri, 29 May 2020 19:52:26 +0000 (19:52 +0000)]
videoio(ffmpeg): fix handling of AVERROR_EOF

decoder should be properly flushed after that

4 years agoMerge pull request #17428 from asmorkalov:as/java_smart_constructors
Alexander Alekhin [Fri, 29 May 2020 18:38:34 +0000 (18:38 +0000)]
Merge pull request #17428 from asmorkalov:as/java_smart_constructors

4 years agoMerge pull request #17419 from YourButterfly:fix_divide_zero_in_darknet_3_4
Alexander Alekhin [Fri, 29 May 2020 17:32:48 +0000 (17:32 +0000)]
Merge pull request #17419 from YourButterfly:fix_divide_zero_in_darknet_3_4

4 years agoGenerate constructor with smart pointer, if it's expected.
Alexander Smorkalov [Fri, 29 May 2020 13:20:28 +0000 (16:20 +0300)]
Generate constructor with smart pointer, if it's expected.

4 years agoMerge pull request #17338 from hunter-college-ossd-spr-2020:contours-toc
Alexander Alekhin [Fri, 29 May 2020 10:40:42 +0000 (10:40 +0000)]
Merge pull request #17338 from hunter-college-ossd-spr-2020:contours-toc

4 years agochk divide 0
YourButterfly [Fri, 29 May 2020 01:54:46 +0000 (09:54 +0800)]
chk divide 0

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 28 May 2020 23:35:11 +0000 (23:35 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17371 from l-bat:nms_model
Liubov Batanina [Thu, 28 May 2020 22:54:19 +0000 (01:54 +0300)]
Merge pull request #17371 from l-bat:nms_model

* Fix NMS bug in DetectionModel

* Fixed comments

* Refactoring

4 years agoMerge pull request #17392 from alalek:dnn_test_yolov4
Alexander Alekhin [Thu, 28 May 2020 22:52:21 +0000 (22:52 +0000)]
Merge pull request #17392 from alalek:dnn_test_yolov4

4 years agoMerge pull request #17384 from dkurt:efficientdet
Alexander Alekhin [Thu, 28 May 2020 22:48:52 +0000 (22:48 +0000)]
Merge pull request #17384 from dkurt:efficientdet

4 years agoMerge pull request #17416 from vpisarev:fix_fillpoly
Alexander Alekhin [Thu, 28 May 2020 21:37:15 +0000 (21:37 +0000)]
Merge pull request #17416 from vpisarev:fix_fillpoly

4 years agofixed fillPoly, the overloaded variant with InputArrayOfArrays parameter (single...
Vadim Pisarevsky [Thu, 28 May 2020 18:36:28 +0000 (21:36 +0300)]
fixed fillPoly, the overloaded variant with InputArrayOfArrays parameter (single or multiple polygons)

4 years agodnn: EfficientDet
Dmitry Kurtaev [Tue, 26 May 2020 07:51:26 +0000 (10:51 +0300)]
dnn: EfficientDet

4 years agodnn(test): add YOLOv4 tests
Alexander Alekhin [Tue, 26 May 2020 16:20:32 +0000 (16:20 +0000)]
dnn(test): add YOLOv4 tests

4 years agoMerge pull request #17410 from asmorkalov:as/formulae_command_typo
Alexander Alekhin [Thu, 28 May 2020 11:45:19 +0000 (11:45 +0000)]
Merge pull request #17410 from asmorkalov:as/formulae_command_typo

4 years agoCommand name typo fix for formulas in documentation.
Alexander Smorkalov [Thu, 28 May 2020 10:59:31 +0000 (13:59 +0300)]
Command name typo fix for formulas in documentation.

4 years agoMerge pull request #17406 from mshabunin:fix-msmf-audio-handling
Alexander Alekhin [Wed, 27 May 2020 19:20:39 +0000 (19:20 +0000)]
Merge pull request #17406 from mshabunin:fix-msmf-audio-handling

4 years agovideoio/MSMF: fixed audio stream handling
Maksim Shabunin [Wed, 27 May 2020 14:52:17 +0000 (17:52 +0300)]
videoio/MSMF: fixed audio stream handling

4 years agoMerge pull request #17359 from YashasSamaga:cuda4dnn-fix-default-stream-wrappers
Alexander Alekhin [Wed, 27 May 2020 11:28:09 +0000 (11:28 +0000)]
Merge pull request #17359 from YashasSamaga:cuda4dnn-fix-default-stream-wrappers

4 years agoMerge pull request #17394 from huningxin:fix_segmentation_py
Ningxin Hu [Wed, 27 May 2020 08:20:07 +0000 (16:20 +0800)]
Merge pull request #17394 from huningxin:fix_segmentation_py

* Fix window title of python segmentation example

* Fix float text position of python segmentation examples

4 years agoMerge pull request #17388 from alalek:dnn_update_network_dump
Alexander Alekhin [Wed, 27 May 2020 07:55:32 +0000 (07:55 +0000)]
Merge pull request #17388 from alalek:dnn_update_network_dump

4 years agoMerge pull request #17386 from l-bat:tf_clamp_subgraph
Liubov Batanina [Tue, 26 May 2020 19:01:47 +0000 (22:01 +0300)]
Merge pull request #17386 from l-bat:tf_clamp_subgraph

* Added ClipByValue subgraph

* Return const nodes

4 years agoMerge pull request #17390 from l-bat:fix_ngraph_multiply
Alexander Alekhin [Tue, 26 May 2020 16:33:12 +0000 (16:33 +0000)]
Merge pull request #17390 from l-bat:fix_ngraph_multiply

4 years agoSwitch ngraph::op::v1::Multiply to v0
Liubov Batanina [Tue, 26 May 2020 13:59:50 +0000 (16:59 +0300)]
Switch ngraph::op::v1::Multiply to v0

4 years agodnn: update network dump code, include ngraph serialization
Alexander Alekhin [Tue, 26 May 2020 12:45:55 +0000 (12:45 +0000)]
dnn: update network dump code, include ngraph serialization

4 years agoMerge pull request #17377 from jtojnar:patch-1
Alexander Alekhin [Tue, 26 May 2020 09:52:13 +0000 (09:52 +0000)]
Merge pull request #17377 from jtojnar:patch-1

4 years agopkg-config: Drop broken include path
Jan Tojnar [Mon, 25 May 2020 20:33:34 +0000 (22:33 +0200)]
pkg-config: Drop broken include path

The legacy `includedir` was removed in 4.0 (https://github.com/opencv/opencv/pull/12477) but it was not removed from the `.pc` file.

This causes issues when trying to link against OpenCV using pkg-config in CMake.

4 years agoMerge pull request #17352 from egorpugin:patch-2
Egor Pugin [Mon, 25 May 2020 20:25:18 +0000 (23:25 +0300)]
Merge pull request #17352 from egorpugin:patch-2

* Fix integer overflow in parseOption().

Previous code does not work for values like 100000MB.

* Fix warning during 32-bit build on inactive code path.

* fix build without C++11