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
Alexander Alekhin [Mon, 20 Apr 2020 17:24:18 +0000 (17:24 +0000)]
Merge pull request #17109 from alalek:cmake_videoio_plugins_all
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 [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 [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
Alexander Alekhin [Wed, 8 Apr 2020 13:28:25 +0000 (13:28 +0000)]
Merge pull request #17009 from mshabunin:msmf-plugin
Maksim Shabunin [Wed, 8 Apr 2020 09:19:00 +0000 (12:19 +0300)]
videoio: set plugin output dir on windows to bin
Maksim Shabunin [Tue, 7 Apr 2020 17:25:10 +0000 (20:25 +0300)]
videoio: added plug-in support to MSMF backend
Alexander Smorkalov [Wed, 8 Apr 2020 10:55:44 +0000 (13:55 +0300)]
Migrated FAQ page to Github Wiki
Alexander Alekhin [Wed, 8 Apr 2020 10:19:09 +0000 (10:19 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 8 Apr 2020 10:18:33 +0000 (10:18 +0000)]
Merge pull request #17014 from dkurt:dnn_onnx_elu
Dmitry Kurtaev [Wed, 8 Apr 2020 09:09:45 +0000 (12:09 +0300)]
Fix Elu import from ONNX
Alexander Alekhin [Tue, 7 Apr 2020 22:01:18 +0000 (22:01 +0000)]
cmake: update generation of 'uninstall' target
Details: https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake
GFleishman [Tue, 7 Apr 2020 19:58:25 +0000 (15:58 -0400)]
Merge pull request #16614 from GFleishman:estimateTranslation3D
added estimateTranslation3D to calib3d/ptsetreg
* added estimateTranslation3D; follows API and implementation structure for estimateAffine3D, but only allows for translation
* void variables in null function to suppress compiler warnings
* added test for estimateTranslation3D
* changed to Matx13d datatype for translation vector in ptsetreg and test; used short license in test
* removed iostream include
* calib3d: code cleanup
Alexander Alekhin [Tue, 7 Apr 2020 19:55:37 +0000 (19:55 +0000)]
Merge pull request #17007 from mshabunin:fix-openjpeg-vs
Alexander Alekhin [Tue, 7 Apr 2020 19:55:01 +0000 (19:55 +0000)]
Merge pull request #16999 from rgarnov:exports_for_gisland_executable
Orest Chura [Tue, 7 Apr 2020 15:53:24 +0000 (18:53 +0300)]
Merge pull request #16717 from OrestChura:oc/goodFeatures
- cv::gapi::goodFeaturesToTrack() kernel is implemented
- tests (for exact check with cv::goodFeaturesToTrack() and for internal cases) are implemented
- a custom comparison function for vectors and a custom test fixture implemented
- some posiible issues as wrong/inexact sorting of two compared vectors are
not taken into account
- initializations of an input Mat using a picture from opencv_extra implemented (function from gapi_streaming_test used)
Alexander Alekhin [Tue, 7 Apr 2020 14:59:42 +0000 (14:59 +0000)]
Merge pull request #16905 from dkurt:dnn_tf2_keras
Alexander Alekhin [Tue, 7 Apr 2020 14:51:14 +0000 (14:51 +0000)]
Merge pull request #15907 from rgarnov:rg/unique_ptr_for_priv_in_fluid
mehlukas [Tue, 7 Apr 2020 14:14:51 +0000 (16:14 +0200)]
Merge pull request #16889 from mehlukas:3.4-consolidateImshow
* consolidate tutorials on image read/display/write
* fix unsused variables
* apply requested changes
* apply requested changes
* fix mistake
Liubov Batanina [Tue, 7 Apr 2020 14:12:18 +0000 (17:12 +0300)]
Merge pull request #16840 from l-bat:matmul_inputs
* Supported FullyConnected layer with two inputs
* Skipped test
* Fix conditions
* Added OpenCL support
* Supported ReduceMean3D
* Supported Expand layer
* Fix warning
* Added Normalize subgraph
* refactoring
* Used addLayer
* Fix check
* Used addLayer
* Skip failed test
* Added normalize1 subgraph
* Fix comments
Maksim Shabunin [Tue, 7 Apr 2020 13:03:17 +0000 (16:03 +0300)]
OpenJPEG: fixed compilation and warnings with VS
Alexander Alekhin [Tue, 7 Apr 2020 12:54:27 +0000 (12:54 +0000)]
Merge pull request #16984 from CSharperMantle:argparse-patch-1
Alexander Alekhin [Tue, 7 Apr 2020 11:01:53 +0000 (11:01 +0000)]
Merge pull request #16640 from malfet:add-16-bit-otsu
Alexander Alekhin [Tue, 7 Apr 2020 10:05:44 +0000 (10:05 +0000)]
Merge pull request #17005 from tomoaki0705:fixHoughKernelLocal
Tomoaki Teshima [Tue, 7 Apr 2020 05:34:55 +0000 (14:34 +0900)]
fix OpenCL spec violation
Nikita Shulga [Fri, 21 Feb 2020 14:14:30 +0000 (06:14 -0800)]
Enable Otsu thresholding for CV_16UC1 images
Dmitry Matveev [Wed, 18 Mar 2020 15:55:36 +0000 (18:55 +0300)]
Added GAPI_EXPORTS to GIslandExecutable since now it needs to be exported
Alexander Alekhin [Mon, 6 Apr 2020 18:14:35 +0000 (18:14 +0000)]
Merge pull request #16878 from dkurt:fix_16877
Alexander Alekhin [Mon, 6 Apr 2020 15:57:43 +0000 (15:57 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 6 Apr 2020 15:57:08 +0000 (15:57 +0000)]
Merge pull request #16970 from l-bat:fix_enet
Alexander Alekhin [Mon, 6 Apr 2020 15:55:33 +0000 (15:55 +0000)]
Merge pull request #16952 from anton-potapov:kw_fixes
Ruslan Garnov [Mon, 6 Apr 2020 15:53:54 +0000 (18:53 +0300)]
Merge pull request #16964 from rgarnov:rg/opaque_for_streaming_exec
* Added GOpaque support to GStreamingExecutor
* Added inter-island GOpaque support to GExecutor
Alexander Alekhin [Fri, 21 Feb 2020 20:30:18 +0000 (20:30 +0000)]
core(MatExpr) fetch result before InputArray wrap
- avoid multiple expression evaluations
- avoid issues with reduced support of InputArray::EXPR
Maxim Pashchenkov [Mon, 6 Apr 2020 15:21:08 +0000 (18:21 +0300)]
Merge pull request #16886 from mpashchenkov:mp/ocv-gapi-add-disable
G-API: DISABLED_ in tests instead #if 0
* Removed if 0, replaced with DISABLED_
* boner
* Added tests for fluid
* -1 instead 0.0
* Added GMatDesc's tests for own::Mat
* IMGPROC_FLUID CORE_FLUID
* Added use_only, disabled tests without kernels
Alexander Alekhin [Mon, 6 Apr 2020 15:19:32 +0000 (15:19 +0000)]
Merge pull request #16911 from anton-potapov:ap/variant_move_issue
Alexander Alekhin [Mon, 6 Apr 2020 15:17:23 +0000 (15:17 +0000)]
Merge pull request #16967 from benji1123:patch-1
Adam Fowles [Mon, 6 Apr 2020 14:49:02 +0000 (10:49 -0400)]
Merge pull request #16992 from afowles:fix-forEach-segfault
* Fixed divide by zero error in forEach
* Dedicated assertion for !empty
Alexander Alekhin [Mon, 6 Apr 2020 14:35:52 +0000 (14:35 +0000)]
Merge pull request #16963 from rgarnov:rg/gframe