Giles Payne [Thu, 4 Jun 2020 12:07:30 +0000 (21:07 +0900)]
Add handling for Android "NDK (Side by side)"
Alexander Alekhin [Thu, 28 May 2020 23:35:11 +0000 (23:35 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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
Alexander Alekhin [Thu, 28 May 2020 22:52:21 +0000 (22:52 +0000)]
Merge pull request #17392 from alalek:dnn_test_yolov4
Alexander Alekhin [Thu, 28 May 2020 22:48:52 +0000 (22:48 +0000)]
Merge pull request #17384 from dkurt:efficientdet
Alexander Alekhin [Thu, 28 May 2020 21:37:15 +0000 (21:37 +0000)]
Merge pull request #17416 from vpisarev:fix_fillpoly
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)
Dmitry Kurtaev [Tue, 26 May 2020 07:51:26 +0000 (10:51 +0300)]
dnn: EfficientDet
Alexander Alekhin [Tue, 26 May 2020 16:20:32 +0000 (16:20 +0000)]
dnn(test): add YOLOv4 tests
Alexander Alekhin [Thu, 28 May 2020 11:45:19 +0000 (11:45 +0000)]
Merge pull request #17410 from asmorkalov:as/formulae_command_typo
Alexander Smorkalov [Thu, 28 May 2020 10:59:31 +0000 (13:59 +0300)]
Command name typo fix for formulas in documentation.
Alexander Alekhin [Wed, 27 May 2020 19:20:39 +0000 (19:20 +0000)]
Merge pull request #17406 from mshabunin:fix-msmf-audio-handling
Maksim Shabunin [Wed, 27 May 2020 14:52:17 +0000 (17:52 +0300)]
videoio/MSMF: fixed audio stream handling
Alexander Alekhin [Wed, 27 May 2020 11:28:09 +0000 (11:28 +0000)]
Merge pull request #17359 from YashasSamaga:cuda4dnn-fix-default-stream-wrappers
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
Alexander Alekhin [Wed, 27 May 2020 07:55:32 +0000 (07:55 +0000)]
Merge pull request #17388 from alalek:dnn_update_network_dump
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
Alexander Alekhin [Tue, 26 May 2020 16:33:12 +0000 (16:33 +0000)]
Merge pull request #17390 from l-bat:fix_ngraph_multiply
Liubov Batanina [Tue, 26 May 2020 13:59:50 +0000 (16:59 +0300)]
Switch ngraph::op::v1::Multiply to v0
Alexander Alekhin [Tue, 26 May 2020 12:45:55 +0000 (12:45 +0000)]
dnn: update network dump code, include ngraph serialization
Alexander Alekhin [Tue, 26 May 2020 09:52:13 +0000 (09:52 +0000)]
Merge pull request #17377 from jtojnar:patch-1
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.
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
Alexander Alekhin [Mon, 25 May 2020 19:59:58 +0000 (19:59 +0000)]
Merge pull request #17376 from alalek:dnn_fix_build
shijiayuan [Mon, 25 May 2020 18:49:37 +0000 (11:49 -0700)]
Merge pull request #17275 from shijiayuan:fixbug
* fix bug for CHECK issue
* remove chack for bpp
* add test for tif file
* add test for tiff file
* change the test name
* use proper bpp value, use clear test names
Alexander Alekhin [Mon, 25 May 2020 18:46:14 +0000 (18:46 +0000)]
Merge pull request #17374 from alalek:dnn_fix_build
Alexander Alekhin [Mon, 25 May 2020 17:55:06 +0000 (17:55 +0000)]
dnn: *_DENORMALS_ZERO_MODE is defined for SSE3
Liubov Batanina [Mon, 25 May 2020 12:34:11 +0000 (15:34 +0300)]
Merge pull request #17332 from l-bat:fix_nms
Fixed NMSBoxes bug
* Added NMS for each class
* Updated cpp sample
* Fixed errors
* Refactoring
* Added NMS for IE
Alexander Alekhin [Mon, 25 May 2020 11:00:13 +0000 (11:00 +0000)]
Merge pull request #17367 from anton-potapov:ap/fluid_fix_uninit_members
Anton Potapov [Mon, 25 May 2020 08:59:28 +0000 (11:59 +0300)]
GAPI: fix uninitialized variables in Fluid
Michal W. Tarnowski [Sun, 24 May 2020 22:48:44 +0000 (00:48 +0200)]
Merge pull request #17361 from mwtarnowski:fix-documentation-gapi-imgproc-blur
* fix documentation for cv::gapi::blur
* remove dst parameter and move ksize parameter to its correct position
Michal W. Tarnowski [Sun, 24 May 2020 22:46:41 +0000 (00:46 +0200)]
Merge pull request #17360 from mwtarnowski:fix-documentation-imgproc-blur
* fix documentation for cv::blur
* correct the position of ksize parameter
YashasSamaga [Sun, 24 May 2020 13:31:17 +0000 (19:01 +0530)]
set stream at the site of creation
Josh Bradley [Sat, 23 May 2020 18:25:01 +0000 (14:25 -0400)]
Merge pull request #17320 from jgbradley1:add-eigen-tensor-conversions
* add eigen tensor conversion functions
* add eigen tensor conversion tests
* add support for column major order
* update eigen tensor tests
* fix coding style and add conditional compilation
* fix conditional compilation checks
* remove whitespace
* rearrange functions for easier reading
* reformat function documentation and add tensormap unit test
* cleanup documentation of unit test
* remove condition duplication
* check Eigen major version, not minor version
* restrict to Eigen v3.3.0+
* add documentation note and add type checking to cv2eigen_tensormap()
Alexander Alekhin [Sat, 23 May 2020 18:18:55 +0000 (18:18 +0000)]
Merge pull request #17349 from YashasSamaga:cuda4dnn-general-fixes
Alexander Alekhin [Fri, 22 May 2020 19:06:42 +0000 (19:06 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 22 May 2020 18:49:42 +0000 (18:49 +0000)]
Merge pull request #17295 from dkurt:dnn_fusion_ftz
YashasSamaga [Tue, 19 May 2020 17:45:02 +0000 (23:15 +0530)]
do not create redundant handles
Alexander Alekhin [Fri, 22 May 2020 10:50:41 +0000 (10:50 +0000)]
Merge pull request #17345 from alalek:build_fix_mac_warnings
Alexander Alekhin [Fri, 22 May 2020 08:12:10 +0000 (08:12 +0000)]
Merge pull request #17343 from hunter-college-ossd-spr-2020:mac-install
Alexander Alekhin [Thu, 21 May 2020 20:41:17 +0000 (20:41 +0000)]
build: fix warnings about TARGET_OS_MACCATALYST
Alexander Alekhin [Thu, 21 May 2020 20:15:55 +0000 (20:15 +0000)]
Merge pull request #17331 from allnes:update_quirc
Boubacar [Thu, 21 May 2020 14:34:17 +0000 (10:34 -0400)]
add note on cmake brew install
Alexander Alekhin [Thu, 21 May 2020 13:53:29 +0000 (13:53 +0000)]
Merge pull request #17339 from hunter-college-ossd-spr-2020:pylint-note
Alexander Alekhin [Thu, 21 May 2020 12:59:30 +0000 (12:59 +0000)]
Merge pull request #17191 from anton-potapov:gapi_variant_converting_ctor_assign_op_reworked
Boubacar [Thu, 21 May 2020 11:55:11 +0000 (07:55 -0400)]
add pylint install note
Alexander Alekhin [Wed, 20 May 2020 18:14:27 +0000 (18:14 +0000)]
Merge pull request #17325 from hunter-college-ossd-spr-2020:nav-links
Nesterov Alexander [Wed, 20 May 2020 15:05:21 +0000 (18:05 +0300)]
Resolve type conflict
Nesterov Alexander [Wed, 20 May 2020 14:30:13 +0000 (17:30 +0300)]
Update version quirc
Anton Potapov [Wed, 29 Apr 2020 23:39:19 +0000 (02:39 +0300)]
GAPI: utils - variant converting ctor and assignment op. reworked
- reworked variant::operator(T&&) and varaint::variant(T&&) to be more
concise and signature accurate with C++17 specification
- restricted cv::detail::OpaqueRef::OpaqueRef(T&&) to not substitute
copy/move ctors
- moved common additions to C++11 version of std <type_traits> to
separte header
Daniel Mallia [Tue, 19 May 2020 22:59:28 +0000 (18:59 -0400)]
Add next and previous navigation links to all tutorials
Liubov Batanina [Tue, 19 May 2020 12:29:50 +0000 (15:29 +0300)]
Merge pull request #16575 from l-bat:flownet2
Support FlowNet2 model
* Support DataAugmentation layer
* Fix warnings
* Fix comments
* Support Correlation layer
* TEST
* Support Correlation layer
* Supported Accum and FlowWarp layers
* Supported ChannelNorm layer
* Supported Resample with inputs.size() > 1
* Fixed comments
* Refactoring
* Added tests
* Add resample test
* Added asserts in resize layer
* Updated DataAugmentation layer
* Update convolution layer
* Refactoring
* Fix data augmentation layer
* Fix caffe importer
* Fix resize
* Switch to Mat ptr
* Remove useless resize type
* Used ResizeLayer in Accum
* Split ChannelNormLayer
* Delete duplicate assert
* Add sample
* Fix sample
* Added colormap
Alexander Alekhin [Tue, 19 May 2020 08:30:54 +0000 (08:30 +0000)]
Merge pull request #17317 from Yosshi999:prevent-build-failure-without-flann
Alexander Alekhin [Mon, 18 May 2020 17:50:16 +0000 (17:50 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 18 May 2020 17:47:16 +0000 (17:47 +0000)]
Merge pull request #17297 from dkurt:dnn_yolov3_ocl
Dmitry Kurtaev [Thu, 14 May 2020 21:53:38 +0000 (00:53 +0300)]
Increase test threshold for YOLOv3 on OCL FP16
dmallia17 [Mon, 18 May 2020 15:53:17 +0000 (11:53 -0400)]
Merge pull request #17313 from hunter-college-ossd-spr-2020:revise-knn-tutorials
* Revise and expand kNN Python tutorials
* Correct NPTEL link
Yosshi999 [Mon, 18 May 2020 14:53:05 +0000 (14:53 +0000)]
ignore tests dependent on flann when flann module is absent
Alexander Alekhin [Mon, 18 May 2020 11:51:59 +0000 (11:51 +0000)]
Merge pull request #17092 from alalek:imgproc_ipp_parallel_gaussuanBlur
Alexander Alekhin [Sun, 17 May 2020 20:33:05 +0000 (20:33 +0000)]
Merge pull request #17304 from chrisballinger:maccatalyst
Alexander Alekhin [Thu, 16 Apr 2020 18:17:22 +0000 (18:17 +0000)]
imgproc: enable GaussianBlur IPP parallel processing
Alexander Alekhin [Thu, 16 Apr 2020 17:37:08 +0000 (17:37 +0000)]
imgproc(perf): add GaussianBlur cases for SIFT
Chris Ballinger [Thu, 14 May 2020 20:43:03 +0000 (13:43 -0700)]
Remove linking against AssetsLibrary framework
Chris Ballinger [Thu, 14 May 2020 19:48:37 +0000 (12:48 -0700)]
Add target conditionals for Mac Catalyst
Alexander Alekhin [Sat, 16 May 2020 18:49:22 +0000 (18:49 +0000)]
Merge pull request #17294 from alalek:issue_17247
Dmitry Kurtaev [Thu, 14 May 2020 18:48:14 +0000 (21:48 +0300)]
Flush to zero Convolution denormal weights
Alexander Alekhin [Fri, 15 May 2020 16:51:29 +0000 (16:51 +0000)]
Merge pull request #17296 from mshabunin:fix-vulkan-build
Alexander Alekhin [Fri, 15 May 2020 15:48:45 +0000 (15:48 +0000)]
Merge pull request #17299 from tweenietomatoes:patch-1
tweenietomatoes [Fri, 15 May 2020 11:41:55 +0000 (14:41 +0300)]
Important single character fix
jumostedu [Thu, 14 May 2020 22:46:25 +0000 (00:46 +0200)]
Merge pull request #15214 from jumostedu:matchtemplmask
* imgproc: templmatch: Add support for mask for all methods
Add support for masked template matching. Fix/scrub old implementation
for masked matching, as it did partly not even really do a meaningful
masking, and only supported limited template matching methods.
Add documentation including formulas for masked matching.
* imgproc: test: Add tests for masked template matching
Test accuracy by comparing to naive implementation for one point.
Test compatibility/correctness by comparing results without mask and
with all ones mask.
All tests are done for all methods, all supported depths, and for 1 and
3 channels.
* imgproc: test: templmatch: Add test for crossCorr
Add a test for the crossCorr function in templmatch.cpp. crossCorr() had
to be added to exported functions to be testable.
This test can maybe help to identify the problem with template matching
on MacOSX.
* fix: Fixed wrong evaluations of the MatExpr on Clang
* fix: removed crossCorr from public interface.
If it should be exported, it should be done as separate PR.
Co-authored-by: Vadim Levin <vadim.levin@xperience.ai>
Maksim Shabunin [Thu, 14 May 2020 20:20:28 +0000 (23:20 +0300)]
Fixed build with latest Vulkan headers
Alexander Alekhin [Thu, 14 May 2020 17:13:29 +0000 (17:13 +0000)]
samples: fix OpenCL events leaks
Ganesh Kathiresan [Thu, 14 May 2020 16:30:01 +0000 (22:00 +0530)]
Merge pull request #17224 from ganesh-k13:bugfix/calib3d/17201
* Fixed indexing in prefilter
* Initialised prefilter
* Initialised prefilter with value initialisation
* Added TC to trigger different Mem Allocs in BufferBM
* Optimize cases with only needed conditions
Alexander Alekhin [Thu, 14 May 2020 12:17:51 +0000 (12:17 +0000)]
Merge pull request #17248 from nroduit:java-addall
Alexander Alekhin [Thu, 14 May 2020 12:17:26 +0000 (12:17 +0000)]
Merge pull request #17055 from vnikoofard:patch-1
Nicolas Roduit [Fri, 8 May 2020 10:22:04 +0000 (12:22 +0200)]
Prefer addall instead of iteration for performance
Alexander Alekhin [Thu, 14 May 2020 07:08:41 +0000 (07:08 +0000)]
Merge pull request #17288 from dkurt:dnn_tf_resize_down
Alexander Alekhin [Thu, 14 May 2020 06:59:27 +0000 (06:59 +0000)]
Merge pull request #17287 from tomoaki0705:fixAkazeTestFailureMali
Alexander Alekhin [Thu, 14 May 2020 06:58:42 +0000 (06:58 +0000)]
Merge pull request #17285 from sauhaardac:patch-1
Alexander Alekhin [Thu, 14 May 2020 06:57:36 +0000 (06:57 +0000)]
Merge pull request #17284 from dkurt:dnn_bn_fusion
Alexander Alekhin [Thu, 14 May 2020 06:55:52 +0000 (06:55 +0000)]
Merge pull request #17281 from l-bat:ssd_placeholder_shape
Alexander Alekhin [Thu, 14 May 2020 06:55:08 +0000 (06:55 +0000)]
Merge pull request #17268 from anton-potapov:deownification_fix
Liubov Batanina [Wed, 13 May 2020 11:44:23 +0000 (14:44 +0300)]
Determine SSD input shape
Dmitry Kurtaev [Wed, 13 May 2020 20:51:52 +0000 (23:51 +0300)]
TensorFlow bilinear resize downscale
Tomoaki Teshima [Wed, 13 May 2020 20:44:14 +0000 (05:44 +0900)]
fix test failure on Mali T760 and Mali T628
Sauhaarda Chowdhuri [Wed, 13 May 2020 20:14:05 +0000 (13:14 -0700)]
Fix #17279 Documentation Error
Update documentation to solve #17279. Simple documentation bug.
Dmitry Kurtaev [Wed, 13 May 2020 19:15:22 +0000 (22:15 +0300)]
Fix BatchNorm reinitialization after fusion
Alexander Alekhin [Wed, 13 May 2020 08:27:04 +0000 (08:27 +0000)]
Merge pull request #17270 from l-bat:ngraph_missed_data
Alexander Alekhin [Tue, 12 May 2020 19:24:28 +0000 (19:24 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 12 May 2020 19:00:49 +0000 (19:00 +0000)]
Merge pull request #17228 from mshabunin:mfx-surface-pool-34
Alexander Alekhin [Tue, 12 May 2020 18:58:54 +0000 (18:58 +0000)]
Merge pull request #17260 from jsxyhelu:add_deepgreen_colormap
Alexander Alekhin [Tue, 12 May 2020 18:53:35 +0000 (18:53 +0000)]
Merge pull request #17211 from alalek:sift_dispatch
Alexander Alekhin [Tue, 12 May 2020 18:50:58 +0000 (18:50 +0000)]
Merge pull request #17196 from alalek:core_matexpr_fix_warning
Alexander Alekhin [Tue, 12 May 2020 16:52:27 +0000 (16:52 +0000)]
Merge pull request #17215 from spmallick:master
Maksim Shabunin [Tue, 17 Dec 2019 12:55:45 +0000 (15:55 +0300)]
CAP_MFX: surface pool with timeout, more parameters
Liubov Batanina [Tue, 12 May 2020 12:50:31 +0000 (15:50 +0300)]
Switch v1::Multiply to v0::Multiply
Liubov Batanina [Tue, 12 May 2020 12:33:57 +0000 (15:33 +0300)]
Merge pull request #17233 from l-bat:onnx_bn
* Added ONNX BatchNorm subgraph
* Move removing constant inputs to addConstantNodesForInitializers
* Added initializers to ONNXGraphWrapper
jsxyhelu [Sun, 10 May 2020 08:30:24 +0000 (16:30 +0800)]
add DeepGreen colormap
Anton Potapov [Tue, 12 May 2020 11:06:50 +0000 (14:06 +0300)]
G-API: "deownification" corrections
- moved "standalone" aliases of cv types to "opencv_includes.hpp" to
keep responsibility principle aplied
- introduced correct aliasing for "descr_of(Mat)" function for
standalone case
- added missing include in `gapi/own/mat.hpp`
Alexander Alekhin [Tue, 12 May 2020 10:53:23 +0000 (10:53 +0000)]
Merge pull request #17230 from asmorkalov:as/issue_17171