Alexander Alekhin [Fri, 24 Apr 2020 17:40:57 +0000 (17:40 +0000)]
Merge pull request #17144 from YashasSamaga:cuda4dnn-fix-i17116
YashasSamaga [Fri, 24 Apr 2020 07:24:17 +0000 (12:54 +0530)]
handle redundant slice in SliceOp
Maxim Pashchenkov [Thu, 23 Apr 2020 17:47:55 +0000 (20:47 +0300)]
Merge pull request #17088 from mpashchenkov:mp/ocv-gapi-kernel-laplacian
G-API: Laplacian and bilateralFilter standard kernels
* Added Laplacian kernel and tests
* Added: Laplacian kernel, Bilateral kernel (CPU, GPU); Performance and accuracy tests for this kernels
* Changed tolerance for GPU test
* boner
* Some changes with alignment; Tests's parameters are the same as for OCV
* Cut tests
* Compressed tests
* Minor changes (rsrt bb)
* Returned types
Alexander Alekhin [Thu, 23 Apr 2020 12:07:26 +0000 (12:07 +0000)]
Merge pull request #17082 from OrestChura:oc/buildPyramid
Alexander Alekhin [Wed, 22 Apr 2020 23:06:14 +0000 (23:06 +0000)]
Merge pull request #17133 from alalek:build_fix_gapi_ie
Alexander Alekhin [Wed, 22 Apr 2020 21:41:36 +0000 (21:41 +0000)]
gapi: fix build, update IE handling, add OPENCV_GAPI_INF_ENGINE
Alexander Alekhin [Wed, 22 Apr 2020 11:42:33 +0000 (11:42 +0000)]
Merge pull request #17122 from mshabunin:videoio-win-dbg-plugins
Maksim Shabunin [Tue, 21 Apr 2020 12:17:45 +0000 (15:17 +0300)]
videoio: load debug versions of plug-ins in debug builds
Alexander Alekhin [Wed, 22 Apr 2020 09:08:02 +0000 (09:08 +0000)]
Merge pull request #17120 from ganesh-k13:bugfix/documentation/16987
Alexander Alekhin [Tue, 21 Apr 2020 21:08:52 +0000 (21:08 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
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
Alexander Alekhin [Tue, 21 Apr 2020 21:02:41 +0000 (21:02 +0000)]
Merge pull request #17030 from ashishkrshrivastava:onnximporter
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
Maxim Pashchenkov [Tue, 21 Apr 2020 20:22:01 +0000 (23:22 +0300)]
Merge pull request #16995 from mpashchenkov:mp/ocv-gapi-standalone-mat
G-API: Mat's "deownification"
* deowned Mat
* boner
* Removed canDescribe test for own::Mat
* Removed STANDALONE flag for apply() and operator()
* Removed: desc_tests for own::Mat, descr_of for own::Mat.
* Returned: tests, cv::gapi::own::descr_of; fixed alignment; Removed own::Mat's headers
* Removed unused header own/mat.hpp from gbackend.hpp
Ganesh Kathiresan [Tue, 21 Apr 2020 14:01:52 +0000 (19:31 +0530)]
Formula Fixes for master branch
Foumula fix 6
Foumula fix 7
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
OrestChura [Mon, 13 Apr 2020 21:53:01 +0000 (00:53 +0300)]
gapi: buildOpticalFlowPyramid() interface, CPUkernel and CPUtests implementation
- kernel added to a cv::gapi::video namespace
- tests to check a kernels (based on cv::video tests for cv::buildOpticalFlowPyramid())
- tests for a combined G-API-pipeline (buildOpticalFlowPyramid() -> calcOpticalFlowPyrLK())
- tests for internal purposes added
- custom function for comparison in tests implemented
AshihsKrShrivastava [Fri, 10 Apr 2020 06:36:09 +0000 (12:06 +0530)]
modification for upsample node fused from unfused Resize subgraph
Liubov Batanina [Tue, 21 Apr 2020 09:26:58 +0000 (12:26 +0300)]
Merge pull request #17112 from l-bat:ie_region
* Support nGraph Region
* Support region since OpenVINO 2020.2
* Skip myriad
Alexander Alekhin [Mon, 20 Apr 2020 18:00:01 +0000 (18:00 +0000)]
Merge pull request #17106 from pauljurczak:patch-3
Alexander Alekhin [Mon, 20 Apr 2020 17:24:18 +0000 (17:24 +0000)]
Merge pull request #17109 from alalek:cmake_videoio_plugins_all
Paul Jurczak [Sun, 19 Apr 2020 07:14:09 +0000 (01:14 -0600)]
Added descriptions of randu and randn
Alexander Alekhin [Sun, 19 Apr 2020 20:41:18 +0000 (20:41 +0000)]
Merge pull request #17110 from alalek:videoio_msmf_fix_warning
Alexander Alekhin [Sun, 19 Apr 2020 19:47:32 +0000 (19:47 +0000)]
videoio(msmf): fix build warning
- warning C4800: 'int': forcing value to bool 'true' or 'false'
Alexander Alekhin [Sun, 19 Apr 2020 19:21:31 +0000 (19:21 +0000)]
cmake: handle VIDEOIO_PLUGIN_LIST=all
Alexander Alekhin [Sun, 19 Apr 2020 18:06:09 +0000 (18:06 +0000)]
Merge pull request #17102 from dkurt:dnn_ie_flexible_inputs
Alexander Alekhin [Sun, 19 Apr 2020 17:38:23 +0000 (17:38 +0000)]
Merge pull request #17105 from benji1123:pointPolygonTest_demo
Ben [Sun, 19 Apr 2020 02:08:36 +0000 (22:08 -0400)]
fix tuple error
Alexander Alekhin [Sat, 18 Apr 2020 21:41:59 +0000 (21:41 +0000)]
Merge pull request #17046 from alalek:core_inputarray_matexpr_cleanup
Dmitry Kurtaev [Sat, 18 Apr 2020 16:42:48 +0000 (19:42 +0300)]
Flexible inputs for OpenVINO IR models
Alexander Alekhin [Fri, 17 Apr 2020 21:24:41 +0000 (21:24 +0000)]
Merge pull request #17096 from spectralio:java-cmake-fix
Alexander Alekhin [Fri, 17 Apr 2020 21:22:07 +0000 (21:22 +0000)]
Merge pull request #17041 from alalek:core_simd_vector_ctors
Alexander Alekhin [Sun, 12 Apr 2020 18:18:17 +0000 (18:18 +0000)]
core(SIMD): align behavior of vector constructors
- setzero() calls are dropped due low-level API nature
- initialization is mandatory if necessary (not an output of other calls)
Maksim Shabunin [Fri, 17 Apr 2020 14:28:42 +0000 (17:28 +0300)]
Merge pull request #16769 from mshabunin:fix-ipp-install
* Do not copy standalone IPP libraries to install for static builds
* Restored IPP installation under option
jshiwam [Fri, 17 Apr 2020 12:16:39 +0000 (17:46 +0530)]
Merge pull request #16795 from jshiwam:qrsample
Added a sample file for qrcode detection in python
* sample python file for qrcode detection added in samples/python
* input taken using argparse and the indents were removed
* Removed unused variables
* updated the format and removed unused variables
Removed the use of global variables and used parameterised contructor instead
=set multi detection true by default
* added detection from camera
* samples(python): coding style in qrcode.py
spectralio [Fri, 17 Apr 2020 11:08:32 +0000 (13:08 +0200)]
fix missing underscore
Alexander Alekhin [Fri, 17 Apr 2020 08:56:29 +0000 (08:56 +0000)]
Merge pull request #17071 from mshabunin:tickmeter-fps
Maksim Shabunin [Wed, 15 Apr 2020 08:18:03 +0000 (11:18 +0300)]
TickMeter: added FPS and AvgTime, improved docs, reformatted
Alexander Alekhin [Thu, 16 Apr 2020 18:28:27 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 16 Apr 2020 16:34:45 +0000 (16:34 +0000)]
Merge pull request #17091 from tomoaki0705:fixHOGDetectorFailure
Tomoaki Teshima [Thu, 16 Apr 2020 15:59:15 +0000 (00:59 +0900)]
avoid test failure on Arm platform
Alexander Alekhin [Thu, 16 Apr 2020 12:19:58 +0000 (12:19 +0000)]
Merge pull request #17075 from alalek:dnn_updates_from_openvino_2020.2
Alexander Alekhin [Thu, 16 Apr 2020 11:19:08 +0000 (11:19 +0000)]
Merge pull request #17080 from dkurt:dnn_ngraph_future
Alexander Alekhin [Thu, 16 Apr 2020 09:44:08 +0000 (09:44 +0000)]
Merge pull request #17084 from tomoaki0705:fixQRInputCheck
Alexander Alekhin [Thu, 16 Apr 2020 09:43:44 +0000 (09:43 +0000)]
Merge pull request #17083 from pauljurczak:patch-2
Alexander Alekhin [Thu, 16 Apr 2020 09:43:20 +0000 (09:43 +0000)]
Merge pull request #17074 from AlanLi7991:doc/python-svm-doc-formula-miss
Dmitry Kurtaev [Wed, 15 Apr 2020 15:12:56 +0000 (18:12 +0300)]
Remove NodeVector for nGraph
Alanli [Thu, 16 Apr 2020 00:05:00 +0000 (09:05 +0900)]
doc: formula miss
Tomoaki Teshima [Wed, 15 Apr 2020 23:24:14 +0000 (08:24 +0900)]
fix wrong condition check
Paul Jurczak [Wed, 15 Apr 2020 22:06:14 +0000 (16:06 -0600)]
Added to description of WCube constructor
`WCube` constructor reorders `min_point`, `max_point` parameters when necessary. I added this info to the description.
Alexander Alekhin [Wed, 15 Apr 2020 18:33:41 +0000 (18:33 +0000)]
Merge pull request #17081 from alalek:backport_17056
Alexander Alekhin [Wed, 15 Apr 2020 18:30:09 +0000 (18:30 +0000)]
Merge pull request #17079 from tomoaki0705:fixCUDABgSgmMOG
Alexander Alekhin [Mon, 13 Apr 2020 21:17:11 +0000 (21:17 +0000)]
build: winpack_dldt with dldt 2020.2
Alexander Alekhin [Wed, 15 Apr 2020 17:24:34 +0000 (17:24 +0000)]
Merge pull request #17056 from alalek:build_opencv_winpack_dldt_2020.2
Tomoaki Teshima [Wed, 15 Apr 2020 14:25:12 +0000 (23:25 +0900)]
fix test failure on Jetson TX2
Alexander Alekhin [Wed, 15 Apr 2020 12:53:42 +0000 (12:53 +0000)]
Merge pull request #17017 from VadimLevin:dev/vlevin/header-parser-explicit-support
Vadim Levin [Wed, 15 Apr 2020 11:25:39 +0000 (14:25 +0300)]
feature: Added `explicit` support to header parser
- It is safe to remove `explicit` keyword for constructors with 1
argument, because it is C++ specific keyword and does not affect any of
the generated binding.
Alexander Alekhin [Thu, 27 Feb 2020 11:28:50 +0000 (14:28 +0300)]
dnn: use OpenVINO 2020.2 defines
original commit:
45263d76429390a4c625f262248312dd68c57111
Vadim Levin [Wed, 15 Apr 2020 11:12:31 +0000 (14:12 +0300)]
test: Added tests for VideoCapture constructors in java
Alexander Alekhin [Mon, 13 Apr 2020 21:17:11 +0000 (21:17 +0000)]
build: winpack_dldt with dldt 2020.2
Alexander Alekhin [Tue, 14 Apr 2020 19:06:01 +0000 (19:06 +0000)]
Merge pull request #17048 from anton-potapov:ap/variant_get_if
Alexander Alekhin [Mon, 13 Apr 2020 03:53:03 +0000 (03:53 +0000)]
core: drop EXPR handing code in InputArray
Alexander Alekhin [Tue, 14 Apr 2020 15:15:44 +0000 (15:15 +0000)]
Merge pull request #17060 from dkurt:dnn_align_ie_pool
Alexander Alekhin [Tue, 14 Apr 2020 15:14:35 +0000 (15:14 +0000)]
Merge pull request #17049 from ilya-lavrenov:il/nn-builder
Anton Potapov [Mon, 13 Apr 2020 08:17:08 +0000 (11:17 +0300)]
GAPI: utils - variant::get_if
adding one more missing function to local version of std::variant
Ilya Lavrenov [Sun, 12 Apr 2020 20:36:21 +0000 (23:36 +0300)]
Fixed compilation when NN builder is not built
Dmitry Kurtaev [Tue, 14 Apr 2020 10:54:54 +0000 (13:54 +0300)]
Align DLIE and nGraph average pooling layers
Alexander Alekhin [Mon, 13 Apr 2020 20:00:12 +0000 (20:00 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 13 Apr 2020 18:17:50 +0000 (18:17 +0000)]
Merge pull request #17025 from tomoaki0705:fixTestFailureCUDABruteForceNonLocalMeans
Alexander Alekhin [Mon, 13 Apr 2020 13:12:12 +0000 (13:12 +0000)]
Merge pull request #16925 from dkurt:dnn_ssd.pytorch
Alexander Alekhin [Mon, 13 Apr 2020 12:34:08 +0000 (12:34 +0000)]
Merge pull request #17047 from alalek:fix_permissions
Dmitry Kurtaev [Sat, 28 Mar 2020 15:53:57 +0000 (18:53 +0300)]
Enable ONNX SSD from https://github.com/amdegroot/ssd.pytorch
Alexander Alekhin [Mon, 13 Apr 2020 11:26:12 +0000 (11:26 +0000)]
Merge pull request #16985 from ashishkrshrivastava:padfusion
Pierre Chatelier [Mon, 13 Apr 2020 06:59:31 +0000 (08:59 +0200)]
Merge pull request #13869 from chacha21:LineVirtualIterator
* LineVirtualIterator
Proposal of LineVirtualIterator, an alternative to "LineIterator not attached to any mat".
This is basically the same implementation, replacing the address difference by a single "offset" variable. elemsize becomes irrelevant and considered to be 1. "step" is thus equal to size.width since no stride is expected.
* Update drawing.cpp
fixed warning
* improvement of LineVirtualIterator
instead of being too conservative, the new implementation gets rid of "offset/step" and only keeps a "Point currentPos" up to date.
left_to_right is renamed to forceLeftToRight as suggested (even for the old LineIterator)
assert() replaced by CV_Assert() (even for the old LineIterator)
* fixed implementation
+fixed last commit so that LineVirtualIterator gives at least the same results as LineIterator
+added a new constructor that does not require any Size, so that no clipping is done and iteration occurs from pt1 to pt2. This is done by adding a spatial offset to pt1 and pt2 so that the same implementation is used, the size being in that case the spatial size between pt1 and pt2
* Update imgproc.hpp
fixed warnings
* Update drawing.cpp
fixed whitespace
* Update drawing.cpp
trailing whitespace
* Update imgproc.hpp
+added a new constructor that takes a Rect rather than a Size. It computes the line pt1->pt2 that clips that rect.
Yet again, this is still based on the same implementation, thanks to the Size and the currentPosOffset that can artifically consider the origin of the rect at (0,0)
* revert changes
revert changes on original LineIterator implementation, that will be superseded by the new LineVirtualIterator anyway
* added test of LineVirtualIterator
* More tests
* refactoring
Use C++11 chained constructors
Improved code style
* improve test
Added offset as random test data.
* fixed order of initialization
* merged LineIterator and VirtualLineIterator
* merged LineIterator & VirtualLineIterator
* merged LineIterator & VirtualLineIterator
* merged LineIterator & VirtualLineIterator
* made LineIterator::operator ++() more efficient
added one perfectly predictable check; in theory, since ptmode is set in the end of the constructor in the header file, the compiler can figure out that it's always true/false and eliminate the check from the inline `LineIterator::operator++()` completely
* optimized Line() function
in the most common case (CV_8UC3) eliminated the check from the loop
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Alexander Alekhin [Mon, 13 Apr 2020 04:29:55 +0000 (04:29 +0000)]
fix files permissions
Alexander Alekhin [Sun, 12 Apr 2020 17:15:48 +0000 (17:15 +0000)]
Merge pull request #17039 from tomoaki0705:fixCudaImgprocFailure
Tomoaki Teshima [Sun, 12 Apr 2020 14:58:53 +0000 (23:58 +0900)]
fix test failure on Jetson TX1/TX2/Nano
Alexander Alekhin [Sat, 11 Apr 2020 17:24:36 +0000 (17:24 +0000)]
Merge pull request #17006 from tpoisonooo:patch-1
tpoisonooo [Tue, 7 Apr 2020 09:01:45 +0000 (17:01 +0800)]
Update grfmt_pxm.cpp
remove comment in .ppm
AshihsKrShrivastava [Sun, 5 Apr 2020 05:32:12 +0000 (11:02 +0530)]
ReflecitonPad2d and ZeroPad2d Subgraph fusion added
Alexander Alekhin [Fri, 10 Apr 2020 16:57:17 +0000 (16:57 +0000)]
Merge pull request #16653 from alalek:core_inputarray_matexpr
Alexander Alekhin [Fri, 10 Apr 2020 16:32:15 +0000 (16:32 +0000)]
Merge pull request #17023 from poelmanc:patch-1
Conrad Poelman [Thu, 9 Apr 2020 09:19:23 +0000 (05:19 -0400)]
Remove std::binary_function as it's invalid C++
std::binary_function was deprecated with C++11 and removed in C++17. It provided just two typedefs which in this case were unused.
Alexander Alekhin [Fri, 10 Apr 2020 12:23:52 +0000 (12:23 +0000)]
Merge pull request #17000 from rgarnov:async_islands
Xiping Yan [Fri, 10 Apr 2020 12:23:13 +0000 (20:23 +0800)]
Merge pull request #17028 from xipingyan:patch-1
* Update OpenCVFindVA_INTEL.cmake
When set env VA_INTEL_IOCL_ROOT, "if($ENV{VA_INTEL_IOCL_ROOT})" don't work.
My modification as follow.
- if($ENV{VA_INTEL_IOCL_ROOT})
+ if(DEFINED ENV{VA_INTEL_IOCL_ROOT})
Refer: https://cmake.org/cmake/help/latest/variable/ENV.html
* based on merge comment, update code
Alexander Alekhin [Sat, 7 Mar 2020 17:16:06 +0000 (17:16 +0000)]
core(test): add InputArray(MatExpr) fetch test
Tomoaki Teshima [Thu, 9 Apr 2020 21:15:16 +0000 (06:15 +0900)]
fix test failure on Jetson Nano/TX1/TX2
Alexander Alekhin [Thu, 9 Apr 2020 19:19:20 +0000 (19:19 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Ruslan Garnov [Mon, 6 Apr 2020 21:34:29 +0000 (00:34 +0300)]
Fixed standalone build, added cv::gapi::proto::ptr test
Alexander Alekhin [Thu, 9 Apr 2020 08:28:20 +0000 (08:28 +0000)]
Merge pull request #16975 from shimat:Branch_4.3.0
shimat [Sat, 4 Apr 2020 00:39:28 +0000 (09:39 +0900)]
fix error at #include <window_winrt_bridge.hpp>
Dmitry Matveev [Tue, 17 Mar 2020 08:55:05 +0000 (11:55 +0300)]
Implement asynchronous execution for islands
Dmitry Matveev [Thu, 12 Mar 2020 14:30:49 +0000 (17:30 +0300)]
Introduced a newStreamSignal() callback for Island Executables
Alexander Alekhin [Wed, 8 Apr 2020 17:23:20 +0000 (20:23 +0300)]
Merge pull request #16788 from OrestChura:oc/optFlowPyrLK
G-API: gapi::calcOpticalFlowPyrLK() Implementation
Alexander Alekhin [Wed, 8 Apr 2020 16:46:34 +0000 (16:46 +0000)]
Merge pull request #17018 from anton-potapov:ap/fix_control_may_reach_end_of_non_void_function_warning
OrestChura [Wed, 8 Apr 2020 14:05:43 +0000 (17:05 +0300)]
gapi: Full calcOpticalFlowPyrLK implementation (2 overloads) and tests
- opencv_gapi module is linked with opencv_video module (optional dependency)
- kernels added to a new cv::gapi::video namespace and a brand new files created to provide gapi_video environment
- there are 2 different kernels as G-API should provide GMat AND GArray<GMat> implementation: cv::calcOptFlowPyrLK doesn't calculate pyramids if vector<Mat> is given so just the cast GMat -> GArray<GMat> wouldn't represent all the cv:: functionality
- tests to check both kernels (based on cv::video tests for cv::calcOpticalFlowPyrLK())
- tests for internal purposes added
- vectors<T> comparison in tests implemented
- new (and old too) common test structures refactored to avoid code copypasting
- "modules/gapi/test/common/gapi_video_tests_common.hpp" created to share some code snippets between perf and acc tests and avoid code copypasting
Alexander Alekhin [Wed, 8 Apr 2020 14:50:00 +0000 (14:50 +0000)]
Merge pull request #17010 from alalek:issue_16896
Anton Potapov [Wed, 8 Apr 2020 14:13:33 +0000 (17:13 +0300)]
GAPI: Fix [-Wreturn-type] warning on standalone mac build
- added [[noreturn]] to standalone version of GAPI_Assert
Alexander Alekhin [Wed, 8 Apr 2020 13:56:57 +0000 (13:56 +0000)]
Merge pull request #16993 from asmorkalov:as/faq_wiki
Alexander Alekhin [Wed, 8 Apr 2020 13:29:51 +0000 (13:29 +0000)]
Merge pull request #16979 from dkurt:dnn_fused_resize_conv