platform/upstream/opencv.git
4 years agoMerge pull request #16575 from l-bat:flownet2
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

4 years agoMerge pull request #17297 from dkurt:dnn_yolov3_ocl
Alexander Alekhin [Mon, 18 May 2020 17:47:16 +0000 (17:47 +0000)]
Merge pull request #17297 from dkurt:dnn_yolov3_ocl

4 years agoIncrease test threshold for YOLOv3 on OCL FP16
Dmitry Kurtaev [Thu, 14 May 2020 21:53:38 +0000 (00:53 +0300)]
Increase test threshold for YOLOv3 on OCL FP16

4 years agoMerge pull request #17313 from hunter-college-ossd-spr-2020:revise-knn-tutorials
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

4 years agoMerge pull request #17092 from alalek:imgproc_ipp_parallel_gaussuanBlur
Alexander Alekhin [Mon, 18 May 2020 11:51:59 +0000 (11:51 +0000)]
Merge pull request #17092 from alalek:imgproc_ipp_parallel_gaussuanBlur

4 years agoMerge pull request #17304 from chrisballinger:maccatalyst
Alexander Alekhin [Sun, 17 May 2020 20:33:05 +0000 (20:33 +0000)]
Merge pull request #17304 from chrisballinger:maccatalyst

4 years agoimgproc: enable GaussianBlur IPP parallel processing
Alexander Alekhin [Thu, 16 Apr 2020 18:17:22 +0000 (18:17 +0000)]
imgproc: enable GaussianBlur IPP parallel processing

4 years agoimgproc(perf): add GaussianBlur cases for SIFT
Alexander Alekhin [Thu, 16 Apr 2020 17:37:08 +0000 (17:37 +0000)]
imgproc(perf): add GaussianBlur cases for SIFT

4 years agoRemove linking against AssetsLibrary framework
Chris Ballinger [Thu, 14 May 2020 20:43:03 +0000 (13:43 -0700)]
Remove linking against AssetsLibrary framework

4 years agoAdd target conditionals for Mac Catalyst
Chris Ballinger [Thu, 14 May 2020 19:48:37 +0000 (12:48 -0700)]
Add target conditionals for Mac Catalyst

4 years agoMerge pull request #17294 from alalek:issue_17247
Alexander Alekhin [Sat, 16 May 2020 18:49:22 +0000 (18:49 +0000)]
Merge pull request #17294 from alalek:issue_17247

4 years agoMerge pull request #17299 from tweenietomatoes:patch-1
Alexander Alekhin [Fri, 15 May 2020 15:48:45 +0000 (15:48 +0000)]
Merge pull request #17299 from tweenietomatoes:patch-1

4 years agoImportant single character fix
tweenietomatoes [Fri, 15 May 2020 11:41:55 +0000 (14:41 +0300)]
Important single character fix

4 years agosamples: fix OpenCL events leaks
Alexander Alekhin [Thu, 14 May 2020 17:13:29 +0000 (17:13 +0000)]
samples: fix OpenCL events leaks

4 years agoMerge pull request #17224 from ganesh-k13:bugfix/calib3d/17201
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

4 years agoMerge pull request #17248 from nroduit:java-addall
Alexander Alekhin [Thu, 14 May 2020 12:17:51 +0000 (12:17 +0000)]
Merge pull request #17248 from nroduit:java-addall

4 years agoMerge pull request #17055 from vnikoofard:patch-1
Alexander Alekhin [Thu, 14 May 2020 12:17:26 +0000 (12:17 +0000)]
Merge pull request #17055 from vnikoofard:patch-1

4 years agoPrefer addall instead of iteration for performance
Nicolas Roduit [Fri, 8 May 2020 10:22:04 +0000 (12:22 +0200)]
Prefer addall instead of iteration for performance

4 years agoMerge pull request #17288 from dkurt:dnn_tf_resize_down
Alexander Alekhin [Thu, 14 May 2020 07:08:41 +0000 (07:08 +0000)]
Merge pull request #17288 from dkurt:dnn_tf_resize_down

4 years agoMerge pull request #17287 from tomoaki0705:fixAkazeTestFailureMali
Alexander Alekhin [Thu, 14 May 2020 06:59:27 +0000 (06:59 +0000)]
Merge pull request #17287 from tomoaki0705:fixAkazeTestFailureMali

4 years agoMerge pull request #17285 from sauhaardac:patch-1
Alexander Alekhin [Thu, 14 May 2020 06:58:42 +0000 (06:58 +0000)]
Merge pull request #17285 from sauhaardac:patch-1

4 years agoMerge pull request #17284 from dkurt:dnn_bn_fusion
Alexander Alekhin [Thu, 14 May 2020 06:57:36 +0000 (06:57 +0000)]
Merge pull request #17284 from dkurt:dnn_bn_fusion

4 years agoMerge pull request #17281 from l-bat:ssd_placeholder_shape
Alexander Alekhin [Thu, 14 May 2020 06:55:52 +0000 (06:55 +0000)]
Merge pull request #17281 from l-bat:ssd_placeholder_shape

4 years agoDetermine SSD input shape
Liubov Batanina [Wed, 13 May 2020 11:44:23 +0000 (14:44 +0300)]
Determine SSD input shape

4 years agoTensorFlow bilinear resize downscale
Dmitry Kurtaev [Wed, 13 May 2020 20:51:52 +0000 (23:51 +0300)]
TensorFlow bilinear resize downscale

4 years agofix test failure on Mali T760 and Mali T628
Tomoaki Teshima [Wed, 13 May 2020 20:44:14 +0000 (05:44 +0900)]
fix test failure on Mali T760 and Mali T628

4 years agoFix #17279 Documentation Error
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.

4 years agoFix BatchNorm reinitialization after fusion
Dmitry Kurtaev [Wed, 13 May 2020 19:15:22 +0000 (22:15 +0300)]
Fix BatchNorm reinitialization after fusion

4 years agoMerge pull request #17270 from l-bat:ngraph_missed_data
Alexander Alekhin [Wed, 13 May 2020 08:27:04 +0000 (08:27 +0000)]
Merge pull request #17270 from l-bat:ngraph_missed_data

4 years agoMerge pull request #17228 from mshabunin:mfx-surface-pool-34
Alexander Alekhin [Tue, 12 May 2020 19:00:49 +0000 (19:00 +0000)]
Merge pull request #17228 from mshabunin:mfx-surface-pool-34

4 years agoMerge pull request #17260 from jsxyhelu:add_deepgreen_colormap
Alexander Alekhin [Tue, 12 May 2020 18:58:54 +0000 (18:58 +0000)]
Merge pull request #17260 from jsxyhelu:add_deepgreen_colormap

4 years agoMerge pull request #17211 from alalek:sift_dispatch
Alexander Alekhin [Tue, 12 May 2020 18:53:35 +0000 (18:53 +0000)]
Merge pull request #17211 from alalek:sift_dispatch

4 years agoMerge pull request #17196 from alalek:core_matexpr_fix_warning
Alexander Alekhin [Tue, 12 May 2020 18:50:58 +0000 (18:50 +0000)]
Merge pull request #17196 from alalek:core_matexpr_fix_warning

4 years agoCAP_MFX: surface pool with timeout, more parameters
Maksim Shabunin [Tue, 17 Dec 2019 12:55:45 +0000 (15:55 +0300)]
CAP_MFX: surface pool with timeout, more parameters

4 years agoSwitch v1::Multiply to v0::Multiply
Liubov Batanina [Tue, 12 May 2020 12:50:31 +0000 (15:50 +0300)]
Switch v1::Multiply to v0::Multiply

4 years agoMerge pull request #17233 from l-bat:onnx_bn
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

4 years agoadd DeepGreen colormap
jsxyhelu [Sun, 10 May 2020 08:30:24 +0000 (16:30 +0800)]
add DeepGreen colormap

4 years agoMerge pull request #17230 from asmorkalov:as/issue_17171
Alexander Alekhin [Tue, 12 May 2020 10:53:23 +0000 (10:53 +0000)]
Merge pull request #17230 from asmorkalov:as/issue_17171

4 years agoMerge pull request #17244 from hunter-college-ossd-spr-2020:toc-updates
Alexander Alekhin [Tue, 12 May 2020 07:35:14 +0000 (07:35 +0000)]
Merge pull request #17244 from hunter-college-ossd-spr-2020:toc-updates

4 years agoMerge pull request #17256 from R-penguins:jstutfix
Alexander Alekhin [Tue, 12 May 2020 07:34:00 +0000 (07:34 +0000)]
Merge pull request #17256 from R-penguins:jstutfix

4 years agoEasier access to opencv.js in tutorial
Rui Hou [Sun, 10 May 2020 15:20:27 +0000 (11:20 -0400)]
Easier access to opencv.js in tutorial

4 years agoMerge pull request #17235 from R-penguins:patch-1
Alexander Alekhin [Sun, 10 May 2020 08:16:33 +0000 (08:16 +0000)]
Merge pull request #17235 from R-penguins:patch-1

4 years agoUpdate Image Watch Tutorial
R-penguins [Thu, 7 May 2020 17:55:05 +0000 (13:55 -0400)]
Update Image Watch Tutorial

Updated the Windows Visual Studio Image Watch tutorial to include download links to the latest versions of Visual Studio Image Watch for newer Visual Studio versions.

4 years agoMerge pull request #17118 from l-bat/concat_3d
Alexander Alekhin [Sat, 9 May 2020 19:24:06 +0000 (22:24 +0300)]
Merge pull request #17118 from l-bat/concat_3d

 Added NDHWC Concat support for TensorFlow

* Supported TF concat 3d

* Skip myriad

* Fix test

4 years agoMerge pull request #17208 from hn-88:3.4
Alexander Alekhin [Fri, 8 May 2020 18:31:11 +0000 (18:31 +0000)]
Merge pull request #17208 from hn-88:3.4

4 years agoUpdate tutorials tables of content for several modules
Daniel Mallia [Fri, 8 May 2020 18:22:30 +0000 (14:22 -0400)]
Update tutorials tables of content for several modules

4 years agoAdded Java and C++ regression test for estimateNewCameraMatrixForUndistortRectify.
Alexander Smorkalov [Wed, 6 May 2020 13:53:41 +0000 (16:53 +0300)]
Added Java and C++ regression test for estimateNewCameraMatrixForUndistortRectify.

4 years agoMerge pull request #17223 from hunter-college-ossd-spr-2020:imgproc-toc
Alexander Alekhin [Thu, 7 May 2020 08:44:02 +0000 (08:44 +0000)]
Merge pull request #17223 from hunter-college-ossd-spr-2020:imgproc-toc

4 years agoMerge pull request #17219 from hunter-college-ossd-spr-2020:mathjax-link
Alexander Alekhin [Thu, 7 May 2020 08:43:16 +0000 (08:43 +0000)]
Merge pull request #17219 from hunter-college-ossd-spr-2020:mathjax-link

4 years agoMerge pull request #17218 from hunter-college-ossd-spr-2020:numpy-links-17212
Alexander Alekhin [Thu, 7 May 2020 08:42:50 +0000 (08:42 +0000)]
Merge pull request #17218 from hunter-college-ossd-spr-2020:numpy-links-17212

4 years agoMerge pull request #17222 from dkurt:dnn_flexible_slice
Alexander Alekhin [Wed, 6 May 2020 19:46:34 +0000 (19:46 +0000)]
Merge pull request #17222 from dkurt:dnn_flexible_slice

4 years agoMerge pull request #16941 from rngtna:examples_dnn_text_decoder
Alexander Alekhin [Wed, 6 May 2020 19:45:05 +0000 (22:45 +0300)]
Merge pull request #16941 from rngtna:examples_dnn_text_decoder

4 years agoUpdate imgproc tutorials table of content Languages fields
Daniel Mallia [Tue, 5 May 2020 22:05:58 +0000 (18:05 -0400)]
Update imgproc tutorials table of content Languages fields

4 years agoAdd text recognition example
Aleksandr Pertovskiy [Wed, 6 May 2020 12:23:55 +0000 (15:23 +0300)]
Add text recognition example

4 years agodnn: Slice with variable input shapes
Dmitry Kurtaev [Tue, 5 May 2020 10:07:26 +0000 (13:07 +0300)]
dnn: Slice with variable input shapes

4 years agoUpdate Supported formula commands - MathJax link
Daniel Mallia [Tue, 5 May 2020 03:50:22 +0000 (23:50 -0400)]
Update Supported formula commands - MathJax link

4 years agoUpdate NumPy links
Daniel Mallia [Tue, 5 May 2020 03:20:52 +0000 (23:20 -0400)]
Update NumPy links

4 years agofeatures2d(sift): enable runtime dispatching
Alexander Alekhin [Tue, 28 Apr 2020 16:42:34 +0000 (16:42 +0000)]
features2d(sift): enable runtime dispatching

4 years agoto make OpenCV compile on mingw32
hn-88 [Sun, 3 May 2020 05:49:04 +0000 (11:19 +0530)]
to make OpenCV compile on mingw32

added #define NO_DSHOW_STRSAFE

4 years agocore(MatExpr): fix warning in case of e.s == (0, 0, 0, 0)
Alexander Alekhin [Fri, 1 May 2020 07:29:10 +0000 (07:29 +0000)]
core(MatExpr): fix warning in case of e.s == (0, 0, 0, 0)

4 years agoMerge pull request #17188 from asmorkalov:as/fisheye_test
Alexander Alekhin [Thu, 30 Apr 2020 13:55:31 +0000 (13:55 +0000)]
Merge pull request #17188 from asmorkalov:as/fisheye_test

4 years agoMerge pull request #17185 from l-bat:yolo_v4
Liubov Batanina [Thu, 30 Apr 2020 13:53:44 +0000 (16:53 +0300)]
Merge pull request #17185 from l-bat:yolo_v4

* Support Yolov4

* Skip Mish on OpenVINO 2020.2

* Revert Mish

* Refactoring

4 years agoMerge pull request #17190 from alalek:dnn_test_win32_skip_list
Alexander Alekhin [Wed, 29 Apr 2020 20:53:54 +0000 (20:53 +0000)]
Merge pull request #17190 from alalek:dnn_test_win32_skip_list

4 years agodnn(test): update skip tests on Win32 configuration
Alexander Alekhin [Wed, 29 Apr 2020 20:01:10 +0000 (20:01 +0000)]
dnn(test): update skip tests on Win32 configuration

4 years agoRestored test disabled during 3.0-alpha preparation.
Alexander Smorkalov [Wed, 29 Apr 2020 14:08:51 +0000 (17:08 +0300)]
Restored test disabled during 3.0-alpha preparation.

4 years agoMerge pull request #17180 from PetWorm:3.4
QIU Xiaochen [Wed, 29 Apr 2020 09:55:59 +0000 (17:55 +0800)]
Merge pull request #17180 from PetWorm:3.4

* fix Scharr nomination

4 years agoMerge pull request #17173 from tomoaki0705:fixOclHogDetect
Alexander Alekhin [Tue, 28 Apr 2020 16:36:14 +0000 (16:36 +0000)]
Merge pull request #17173 from tomoaki0705:fixOclHogDetect

4 years agofix test failure on ODROID-N2
Tomoaki Teshima [Tue, 28 Apr 2020 12:46:31 +0000 (21:46 +0900)]
fix test failure on ODROID-N2

4 years agoMerge pull request #16983 from dkurt:dnn_tf_prelu
Alexander Alekhin [Tue, 28 Apr 2020 08:37:46 +0000 (08:37 +0000)]
Merge pull request #16983 from dkurt:dnn_tf_prelu

4 years agoMerge pull request #16914 from jackson0223:patch-1
Alexander Alekhin [Tue, 28 Apr 2020 08:36:51 +0000 (08:36 +0000)]
Merge pull request #16914 from jackson0223:patch-1

4 years agoPReLU from Tensorflow
Dmitry Kurtaev [Sat, 4 Apr 2020 17:27:59 +0000 (20:27 +0300)]
PReLU from Tensorflow

4 years agoRestore face detection train.prototxt from #9516
jackson0223 [Thu, 26 Mar 2020 18:05:33 +0000 (02:05 +0800)]
Restore face detection train.prototxt from #9516

4 years agofeatures2d: keep history of simd.cpp
Alexander Alekhin [Mon, 27 Apr 2020 18:19:14 +0000 (18:19 +0000)]
features2d: keep history of simd.cpp

4 years agofeatures2d: copy sift.dispatch.cpp
Alexander Alekhin [Mon, 27 Apr 2020 18:18:16 +0000 (18:18 +0000)]
features2d: copy sift.dispatch.cpp

4 years agofeatures2d: copy sift.simd.hpp
Alexander Alekhin [Mon, 27 Apr 2020 18:17:15 +0000 (18:17 +0000)]
features2d: copy sift.simd.hpp

4 years agoMerge pull request #17159 from pauljurczak:patch-3
Alexander Alekhin [Mon, 27 Apr 2020 12:43:32 +0000 (12:43 +0000)]
Merge pull request #17159 from pauljurczak:patch-3

4 years agoMerge pull request #17161 from alalek:cmake_protobuf_fix
Alexander Alekhin [Mon, 27 Apr 2020 12:24:37 +0000 (12:24 +0000)]
Merge pull request #17161 from alalek:cmake_protobuf_fix

4 years agoMerge pull request #17157 from alalek:issue_17138
Alexander Alekhin [Mon, 27 Apr 2020 12:23:44 +0000 (12:23 +0000)]
Merge pull request #17157 from alalek:issue_17138

4 years agocmake: fix protobuf handling
Alexander Alekhin [Sun, 26 Apr 2020 04:42:42 +0000 (04:42 +0000)]
cmake: fix protobuf handling

4 years agoFix test
Liubov Batanina [Sun, 26 Apr 2020 17:42:11 +0000 (20:42 +0300)]
Fix test

4 years agoAdded to Camera constructor parameter description
Paul Jurczak [Sun, 26 Apr 2020 06:17:39 +0000 (00:17 -0600)]
Added to Camera constructor parameter description

4 years agodnn(protobuf): backport AllowUnknownField(), SetRecursionLimit()
Alexander Alekhin [Sat, 25 Apr 2020 20:33:59 +0000 (20:33 +0000)]
dnn(protobuf): backport AllowUnknownField(), SetRecursionLimit()

- limit recursion in SkipField*() calls

4 years agoMerge pull request #17119 from alalek:move_sift
Alexander Alekhin [Fri, 24 Apr 2020 18:15:15 +0000 (18:15 +0000)]
Merge pull request #17119 from alalek:move_sift

4 years agoMerge pull request #17149 from alalek:core_simd_suppress_coverity
Alexander Alekhin [Fri, 24 Apr 2020 17:46:53 +0000 (17:46 +0000)]
Merge pull request #17149 from alalek:core_simd_suppress_coverity

4 years agoMerge pull request #17108 from HowardsPlayPen:patch-1
Alexander Alekhin [Fri, 24 Apr 2020 17:25:31 +0000 (17:25 +0000)]
Merge pull request #17108 from HowardsPlayPen:patch-1

4 years agocore(SIMD): suppress coverity UNINIT_CTOR on SIMD vectors
Alexander Alekhin [Fri, 24 Apr 2020 16:36:35 +0000 (16:36 +0000)]
core(SIMD): suppress coverity UNINIT_CTOR on SIMD vectors

4 years agoUpdate videocapture_basic.cpp
HowardsPlayPen [Sun, 19 Apr 2020 11:51:27 +0000 (12:51 +0100)]
Update videocapture_basic.cpp

I believe you are using the wrong version of open() on line 28 - adding deviceID + appId together. It's better to use the new version of .open() taking two integers as parameter.

4 years agoMerge pull request #17134 from alalek:dnn_ie_avoid_conversion_to_legacy
Alexander Alekhin [Thu, 23 Apr 2020 22:39:45 +0000 (22:39 +0000)]
Merge pull request #17134 from alalek:dnn_ie_avoid_conversion_to_legacy

4 years agoMerge pull request #17129 from alalek:dnn_myriad_tests
Alexander Alekhin [Thu, 23 Apr 2020 19:41:15 +0000 (19:41 +0000)]
Merge pull request #17129 from alalek:dnn_myriad_tests

4 years agodnn(ie): avoid conversion to legacy CNNNetworkImpl
Alexander Alekhin [Wed, 22 Apr 2020 22:33:12 +0000 (22:33 +0000)]
dnn(ie): avoid conversion to legacy CNNNetworkImpl

4 years agofeatures2d(sift): move SIFT tests / headers / build fixes
Alexander Alekhin [Tue, 21 Apr 2020 06:58:21 +0000 (06:58 +0000)]
features2d(sift): move SIFT tests / headers / build fixes

4 years agodnn(test): skip failed NGRAPH/MYRIAD tests
Alexander Alekhin [Wed, 22 Apr 2020 09:01:25 +0000 (09:01 +0000)]
dnn(test): skip failed NGRAPH/MYRIAD tests

4 years agoMerge pull request #16887 from ashishkrshrivastava:fasterrcnn
Alexander Alekhin [Wed, 22 Apr 2020 09:47:45 +0000 (09:47 +0000)]
Merge pull request #16887 from ashishkrshrivastava:fasterrcnn

4 years agoSkip myriad
Liubov Batanina [Wed, 22 Apr 2020 06:52:20 +0000 (09:52 +0300)]
Skip myriad

4 years agoadd fused batchNorm Upsample
ashishiva3@gmail.com [Thu, 19 Mar 2020 16:52:36 +0000 (22:22 +0530)]
add fused batchNorm Upsample

4 years agoMerge pull request #17123 from ganesh-k13:bugfix/documentation/3.4/16987
Alexander Alekhin [Tue, 21 Apr 2020 21:03:35 +0000 (21:03 +0000)]
Merge pull request #17123 from ganesh-k13:bugfix/documentation/3.4/16987

4 years agoMerge pull request #17030 from ashishkrshrivastava:onnximporter
Alexander Alekhin [Tue, 21 Apr 2020 21:02:41 +0000 (21:02 +0000)]
Merge pull request #17030 from ashishkrshrivastava:onnximporter

4 years agoMerge pull request #16961 from rayonnant14:objdetect_different_return_value_issue
Polina Smolnikova [Tue, 21 Apr 2020 20:44:50 +0000 (23:44 +0300)]
Merge pull request #16961 from rayonnant14:objdetect_different_return_value_issue

QRDetectMulti : different return value bug fix

* QRDetectMulti : bug fix

* added tests

* changed test image due to large size of previous test image

4 years agoFormula Fixes for 3.4 branch
Ganesh Kathiresan [Tue, 21 Apr 2020 10:38:58 +0000 (16:08 +0530)]
Formula Fixes for 3.4 branch

Foumula fix 1

Foumula fix 2

Foumula fix 3

Foumula fix 4

Foumula fix 5

Foumula fix 8

4 years agoSupported TF concat 3d
Liubov Batanina [Tue, 21 Apr 2020 07:34:56 +0000 (10:34 +0300)]
Supported TF concat 3d