Ruslan Garnov [Thu, 4 Jul 2019 15:19:09 +0000 (18:19 +0300)]
Merge pull request #14917 from rgarnov:gapi_planar_kernels
G-API planar kernels (#14917)
* Added resizeP with tests
* NV12 planar filters
* fix warnings in ResizeP test
* fix out mat ocv warning
* sz_on - > sz rename
* cpu tests new signature
* try to fix resizeP test
* trailing spaces remove
* doxygen doc fixed
* doxygen minor fix
* more doxygen fixes
* Doxygen corrected and extended after review.
Alexander Alekhin [Tue, 2 Jul 2019 21:17:45 +0000 (21:17 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 2 Jul 2019 21:14:02 +0000 (21:14 +0000)]
Merge pull request #14954 from rafagjordana:fix_blob_detection_insertion_sort
Alexander Alekhin [Tue, 2 Jul 2019 21:12:00 +0000 (21:12 +0000)]
Merge pull request #14926 from alalek:tbb_version_2019u8
Alexander Alekhin [Tue, 2 Jul 2019 20:31:33 +0000 (20:31 +0000)]
Merge pull request #14929 from alalek:cmake_rpath_link_support
Rafa Gomez-Jordana [Mon, 1 Jul 2019 15:48:48 +0000 (17:48 +0200)]
Fix blob detector insertion sort
Alexander Alekhin [Tue, 2 Jul 2019 19:50:47 +0000 (19:50 +0000)]
Merge pull request #14964 from arnaudbrejeon:bug_fix_14955
Alexander Alekhin [Tue, 2 Jul 2019 19:43:09 +0000 (19:43 +0000)]
Merge pull request #14963 from alalek:pr14925_fix
arnaudbrejeon [Tue, 2 Jul 2019 16:56:31 +0000 (09:56 -0700)]
Fix crash, add assert and test
Alexander Alekhin [Tue, 2 Jul 2019 16:40:21 +0000 (16:40 +0000)]
Merge pull request #14958 from tomoaki0705:fixArmFp16Behavior
Alexander Alekhin [Tue, 2 Jul 2019 16:05:53 +0000 (16:05 +0000)]
Merge pull request #14925 from StefanBruens:handle_absolute_include_path
Andrey Golubev [Tue, 2 Jul 2019 16:03:45 +0000 (19:03 +0300)]
Merge pull request #14946 from andrey-golubev:obj_not_ref
G-API: Use object instead of reference in extended lifetime case (#14946)
* Use object instead of reference
* Make the object const
Tomoaki Teshima [Tue, 2 Jul 2019 12:57:15 +0000 (21:57 +0900)]
re-enable CPU_BASELINE=FP16 on Armv7 platform
Alexander Alekhin [Tue, 2 Jul 2019 09:44:29 +0000 (09:44 +0000)]
Merge pull request #14953 from alalek:core_static_analysis_eval_expr
armenpoghosov [Mon, 1 Jul 2019 18:57:28 +0000 (20:57 +0200)]
Merge pull request #14828 from armenpoghosov:parmen_RANSACPointSetRegistrator_getSubset_disaster_cleanup
Parmen ransac point set registrator get subset disaster cleanup (#14828)
Alexander Alekhin [Mon, 1 Jul 2019 17:00:24 +0000 (17:00 +0000)]
Merge pull request #14837 from Cartucho:fix_laplace_operator_on_python
Alexander Alekhin [Mon, 1 Jul 2019 16:58:57 +0000 (16:58 +0000)]
Merge pull request #14880 from dkurt:dnn_ie_tests
Vitaly Tuzov [Mon, 1 Jul 2019 16:53:51 +0000 (19:53 +0300)]
Merge pull request #14916 from terfendail:wsignmask_deprecated
* Avoid using v_signmask universal intrinsic and mark it as deprecated
* Renamed v_find_negative to v_scan_forward
Alexander Alekhin [Mon, 1 Jul 2019 16:48:05 +0000 (16:48 +0000)]
Merge pull request #14951 from alalek:issue_14937
Alexander Alekhin [Mon, 1 Jul 2019 15:17:03 +0000 (18:17 +0300)]
core: evaluate CV_Error() parameters during static scans
Alexander Alekhin [Mon, 1 Jul 2019 14:54:40 +0000 (17:54 +0300)]
dnn: fix build with Vulkan
StefanBruens [Sun, 30 Jun 2019 16:04:25 +0000 (18:04 +0200)]
Merge pull request #14936 from StefanBruens:crosscorr_cleanup
Crosscorr cleanup (#14936)
* Simplify code for convolution destination type/size
For the 2d filter code, destination size equals source size, and the
crossCorr function even (re-)creates the output matrix with the given size.
The number of channels also have to match. The destination type() is the
one used to create the output matrix, so we can use its type() here.
This is a preparatory patch.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
* Remove redundant destination size and type parameters from crossCorr
All calling sites of crossCorr already use (...,
mat, mat.size(), mat.type(), ...), so the parameters are redundant.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Alexander Alekhin [Sun, 30 Jun 2019 07:47:07 +0000 (07:47 +0000)]
Merge pull request #14934 from StefanBruens:silence_assignment_operator_warning
Stefan Brüns [Sat, 29 Jun 2019 18:28:24 +0000 (20:28 +0200)]
Explicitly default operator= for Vec<T, n>
Due to the explicitly declared copy constructor Vec<T, n>::Vec(Vec <T,n>&)
GCC 9 warns if there is no assignment operator, as having one typically
requires the other (rule-of-three, constructor/desctructor/assginment).
As the values are just a plain array the default assignment operator does
the right thing. Tell the compiler explicitly to default it.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Alexander Alekhin [Sat, 29 Jun 2019 17:27:48 +0000 (17:27 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 29 Jun 2019 17:26:31 +0000 (17:26 +0000)]
Merge pull request #14931 from dkurt:fix_dnn_js_sample_v4
Alexander Alekhin [Sat, 29 Jun 2019 17:17:16 +0000 (17:17 +0000)]
Merge pull request #14920 from StefanBruens:fix_arm_on_aarch64_detection
Dmitry Kurtaev [Sat, 29 Jun 2019 16:21:14 +0000 (19:21 +0300)]
Fix JS sample of dnn
Alexander Alekhin [Fri, 28 Jun 2019 16:32:59 +0000 (19:32 +0300)]
3rdparty: TBB version 2018u1 => 2019u8
- make it configurable via OPENCV_TBB_RELEASE + OPENCV_TBB_RELEASE_MD5
- remove legacy support
Alexander Alekhin [Fri, 28 Jun 2019 22:39:38 +0000 (22:39 +0000)]
cmake: support rpath-link linker option
- builds with CMAKE_SKIP_RPATH=ON should properly find project .so files from <build>/lib directory
- $ORIGIN doesn't work properly in cross-compilation mode
Alexander Alekhin [Fri, 28 Jun 2019 20:33:17 +0000 (20:33 +0000)]
cmake: normalize include directories in OpenCVConfig.cmake
Alexander Alekhin [Fri, 28 Jun 2019 16:52:03 +0000 (16:52 +0000)]
Merge pull request #14885 from anton-potapov:common_flow_explanatory_test_cases
Alexander Alekhin [Fri, 28 Jun 2019 16:01:32 +0000 (16:01 +0000)]
Merge pull request #14923 from andrey-golubev:imgproc_tests_update_clean
Andrey Golubev [Fri, 28 Jun 2019 14:59:52 +0000 (17:59 +0300)]
Merge pull request #14922 from andrey-golubev:operators_tests_update_clean
G-API: Align operators tests to new test model (#14922)
* Align operators tests to new test model
* Change init function in NotOperatorTest
Anton Potapov [Thu, 16 May 2019 17:40:00 +0000 (20:40 +0300)]
Async API for GAPI
- explanatory test cases for common usage models
atalaman [Fri, 28 Jun 2019 14:11:03 +0000 (17:11 +0300)]
Merge pull request #14892 from TolyaTalamanov:at/parameterized-render-tests
G-API: Parameterized render tests (#14892)
* Init commit
* Add mat size as test parameter
* Add test for text render
* Add test for rect render
* Add tests for line and circle
* Remove old render tests
* Init output mats
* Remove methods input arguments
* Add comment about data loss in BGR2NV12 conversion
* Add edge test cases
* Replace default color for out mats black -> white
Stefan Brüns [Fri, 28 Jun 2019 13:36:18 +0000 (15:36 +0200)]
Handle absolute OPENCV_INCLUDE_INSTALL_PATH correctly
In case OPENCV_INCLUDE_INSTALL_PATH is absolute (i.e. starts with a "/"),
the path ends up with a double "/".
While this is mostly equivalent to a single slash, it may have a nasty
side effect when:
- OpenCV_INSTALL_PATH is empty
- OPENCV_INCLUDE_INSTALL_PATH is "/usr/include"
- the calling build script uses "-isystem" to specify the path to the
headers of dependencies (to avoid warnings)
Specifying "-isystem /usr/include" breaks the path ordering, and GCC can
no longer find its "stdlib.h", thus CMake filters such statements.
Unfortunately it fails to do so when using "//usr/include".
Dmitry Kurtaev [Mon, 24 Jun 2019 18:55:32 +0000 (21:55 +0300)]
Enable some tests for Inference Engine backend
Stefan Brüns [Thu, 27 Jun 2019 22:17:26 +0000 (00:17 +0200)]
Fix detection of 32bit ARM builds on Aarch64
It is perfectly possible to compile ARM binaries on Aarch64. Generalize
the code to no only swap X86 with X86_64, but also ARM and AARCH64.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Andrey Golubev [Wed, 26 Jun 2019 15:33:16 +0000 (18:33 +0300)]
Align imgproc tests to new model
Andrey Golubev [Fri, 28 Jun 2019 10:07:41 +0000 (13:07 +0300)]
Merge pull request #14757 from andrey-golubev:core_tests_update
G-API: Introduce new approach to write accuracy tests (#14757)
* G-API: Introduce new common accuracy test fixture
* Enable Range<> to Seq<> implicit conversion
* Fix shadowing parameters
* Update license headers
* Rename ALIGNED_TYPE to SAME_TYPE
* Move MkRange to tests
* Fix TODO(agolubev) in test instantiations
* Squash simple fixture declarations in one line
* Remove unused line
* Fix Windows issues with macro expansion
* Choose between 1 or 2 matrix initialization
* Redesign common class behavior
Use "views" for GetParam() provided by GTest
base class instead of doing segregation
(with copy!) of common and specific parameters:
request common or specific parameter directly
by index from GetParam()-returned parameters
* Refine user-level API and usage of new test model
* Fix -fpermissive errors
* Remove unnecessary init calls
* Replace GCompileArgs member variable with func ptr
* Rename initMatsRandN to make its behavior explicit
Rename initMatsRandN to initMatrixRandN to eliminate confusion:
initMatsRandN only initialized first matrix (similarly to
initMatrixRandU)
* Fix common of initNothing
* Update copyright dates in missed files
* Add check for specific parameters
* Fix coment stlye
Alexander Alekhin [Thu, 27 Jun 2019 21:34:41 +0000 (21:34 +0000)]
Merge pull request #14918 from alalek:dnn_ie_compilation
Alexander Alekhin [Thu, 27 Jun 2019 14:04:10 +0000 (17:04 +0300)]
dnn: adjust compilation options
Alexander Alekhin [Thu, 27 Jun 2019 14:22:15 +0000 (14:22 +0000)]
Merge pull request #14914 from Nuzhny007:3.4
Alexander Alekhin [Thu, 27 Jun 2019 10:16:59 +0000 (10:16 +0000)]
Merge pull request #14905 from savuor:fix/inst_region_unique
Alexander Alekhin [Thu, 27 Jun 2019 10:14:24 +0000 (10:14 +0000)]
Merge pull request #14881 from dkurt:dnn_ie_num_threads
Nuzhny007 [Thu, 27 Jun 2019 10:13:48 +0000 (13:13 +0300)]
Fixed names conflict with dldt
Dmitry Kurtaev [Mon, 24 Jun 2019 19:41:30 +0000 (22:41 +0300)]
Limit number of threads in CPU plugin of IE by OpenCV's getNumThreads
Rostislav Vasilikhin [Wed, 26 Jun 2019 22:17:26 +0000 (01:17 +0300)]
fixed multi instrumentations
Alexander Alekhin [Wed, 26 Jun 2019 20:17:19 +0000 (20:17 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 26 Jun 2019 20:04:26 +0000 (23:04 +0300)]
Merge pull request #14899 from alalek:dnn_fix_bnll_layer
* dnn: fix BNLLLayer implementation
details: https://github.com/BVLC/caffe/blame/1.0/src/caffe/layers/bnll_layer.cpp#L17
* dnn: enable OCV/OpenCL BNLL layer
Alexander Alekhin [Wed, 26 Jun 2019 20:03:57 +0000 (20:03 +0000)]
Merge pull request #14895 from alalek:dnn_ie_extensions_path
Alexander Alekhin [Wed, 26 Jun 2019 20:03:04 +0000 (20:03 +0000)]
Merge pull request #14886 from alalek:fix_grabcut_kmeans_call_14879
Apoorv Goel [Wed, 26 Jun 2019 16:35:11 +0000 (19:35 +0300)]
Merge pull request #14898 from UnderscoreAsterisk:flann-warnings-and-4376
Keep a local copy of `features` from `flann::GenericIndex ` constructor (#14898)
* Fix warnings on Windows
* Fix #4376
Alexander Alekhin [Wed, 26 Jun 2019 15:54:46 +0000 (15:54 +0000)]
Merge pull request #14900 from opencv:dnn_fix_js_sample_v3
Dmitry Kurtaev [Wed, 26 Jun 2019 14:27:56 +0000 (17:27 +0300)]
Remove extra ")"
Alexander Alekhin [Wed, 26 Jun 2019 14:13:03 +0000 (14:13 +0000)]
Merge pull request #14890 from alalek:dnn_consistent_protobuf_readers
Alexander Alekhin [Wed, 26 Jun 2019 14:10:14 +0000 (14:10 +0000)]
Merge pull request #14889 from alalek:issue_14863
Alexander Alekhin [Wed, 26 Jun 2019 13:35:21 +0000 (13:35 +0000)]
Merge pull request #14775 from cudawarped:master
Alexander Alekhin [Wed, 26 Jun 2019 13:34:09 +0000 (13:34 +0000)]
Merge pull request #13252 from take1014:filter2d_13179
James Bowley [Mon, 10 Jun 2019 16:42:37 +0000 (17:42 +0100)]
Update obsolete flag in Intel video decoder.
Old flag resulted in software implementation being selected when the Intel decoder is not the primary adapter.
Alexander Alekhin [Wed, 26 Jun 2019 06:41:01 +0000 (06:41 +0000)]
dnn: configure plugin path for InferenceEngine
Alexander Alekhin [Tue, 25 Jun 2019 22:07:02 +0000 (22:07 +0000)]
Merge pull request #14869 from alalek:samples_msvs2019_support
Alexander Alekhin [Tue, 25 Jun 2019 22:00:25 +0000 (22:00 +0000)]
Merge pull request #14814 from alalek:dnn_skip_test_tags
Alexander Alekhin [Tue, 25 Jun 2019 15:03:04 +0000 (18:03 +0300)]
dnn: both protobuf readers have similar behavior
- ReadProtoFromTextFile
- ReadProtoFromTextBuffer
Alexander Alekhin [Tue, 25 Jun 2019 15:01:12 +0000 (15:01 +0000)]
Merge pull request #14849 from thangktran:thangktran/feature/fillPoly_and_fillConvexPoly_js_binding
Alexander Alekhin [Tue, 25 Jun 2019 14:24:50 +0000 (17:24 +0300)]
core(intrin): v_load_low() workaround for aarch64+clang
Alexander Alekhin [Tue, 25 Jun 2019 10:53:49 +0000 (10:53 +0000)]
Merge pull request #14875 from Legoless:master
Alexander Alekhin [Tue, 25 Jun 2019 10:42:04 +0000 (13:42 +0300)]
imgproc: fix kmeans() call from grabCut()
Dal Rupnik [Mon, 24 Jun 2019 12:42:03 +0000 (14:42 +0200)]
[#14873] Fix code signing issue in Try Compile script
Alexander Alekhin [Mon, 24 Jun 2019 18:29:29 +0000 (18:29 +0000)]
Merge pull request #14878 from JoeHowse:4.1.0-patches
Alexander Alekhin [Mon, 24 Jun 2019 18:29:05 +0000 (18:29 +0000)]
Merge pull request #14876 from dkurt:fix_js_face_recognition_v2
atalaman [Mon, 24 Jun 2019 14:37:32 +0000 (17:37 +0300)]
Merge pull request #14820 from TolyaTalamanov:at/circle_and_line
G-API: Implement line and circle draw operations (#14820)
* Implement line and circle draw operations
* Fix comments to review
Dmitry Kurtaev [Mon, 24 Jun 2019 13:41:37 +0000 (16:41 +0300)]
Fix face recognition JS sample
Alexander Alekhin [Mon, 24 Jun 2019 12:37:52 +0000 (12:37 +0000)]
Merge pull request #14874 from alalek:videoio_fix_gstreamer_plugin_build
Maksim Shabunin [Fri, 21 Jun 2019 14:47:31 +0000 (17:47 +0300)]
videoio: fix GStreamer plugin build
Feng Chen [Mon, 24 Jun 2019 09:27:42 +0000 (17:27 +0800)]
Merge pull request #14845 from vonchenplus:ocv_mirrorpad
* tensorflow support mirror pad
* revert macro define
* revert macro define
* reduce code duplication
* revert macro define
tribta [Wed, 19 Jun 2019 18:52:09 +0000 (19:52 +0100)]
Fix Python code, for the tutorial_laplace_operator, to get the same result between the Cpp, Java and Python
Alexander Alekhin [Sat, 15 Jun 2019 12:17:25 +0000 (12:17 +0000)]
dnn(test): replace SkipTestException with tags
Alexander Alekhin [Sun, 23 Jun 2019 12:42:26 +0000 (12:42 +0000)]
Merge pull request #14847 from alalek:dnn_fix_test_data_searching
Alexander Alekhin [Sat, 22 Jun 2019 16:43:40 +0000 (16:43 +0000)]
Merge pull request #14305 from cameron-martin:calib3d-js
Alexander Alekhin [Sat, 22 Jun 2019 16:24:21 +0000 (16:24 +0000)]
samples: support MSVS 2019 compiler
requires CMake 3.14+
Alexander Alekhin [Sat, 22 Jun 2019 13:57:10 +0000 (13:57 +0000)]
Merge pull request #14861 from alalek:update_version_4.1.1-pre
Alexander Alekhin [Sat, 22 Jun 2019 07:15:02 +0000 (07:15 +0000)]
Merge pull request #14864 from dkurt:fix_js_face_recognition
Lubov Batanina [Sat, 22 Jun 2019 07:13:28 +0000 (10:13 +0300)]
Merge pull request #14833 from l-bat:ocv_eltwise3d
* Support Eltwise3d
* Refactoring
* Fix test
Dmitry Kurtaev [Sat, 22 Jun 2019 04:53:52 +0000 (21:53 -0700)]
Fix face recognition sample for JS
Alexander Alekhin [Fri, 21 Jun 2019 16:18:50 +0000 (19:18 +0300)]
pre: OpenCV 4.1.1 (version++)
Alexander Alekhin [Fri, 21 Jun 2019 16:18:23 +0000 (19:18 +0300)]
dnn: bump API version
Alexander Alekhin [Fri, 21 Jun 2019 14:27:14 +0000 (17:27 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 21 Jun 2019 14:26:40 +0000 (17:26 +0300)]
Merge pull request #14855 from alalek:update_version_3.4.7-pre
Alexander Alekhin [Fri, 21 Jun 2019 11:25:06 +0000 (14:25 +0300)]
pre: OpenCV 3.4.7 (version++)
Alexander Alekhin [Fri, 21 Jun 2019 11:22:01 +0000 (14:22 +0300)]
experimental version++
Alexander Alekhin [Fri, 21 Jun 2019 13:53:52 +0000 (13:53 +0000)]
Merge pull request #14848 from alalek:build_warnings_avx512
Alexander Alekhin [Fri, 21 Jun 2019 13:51:22 +0000 (13:51 +0000)]
Merge pull request #14846 from alalek:videoio_gstreamer_issues_master
Alexander Alekhin [Fri, 21 Jun 2019 13:38:34 +0000 (13:38 +0000)]
Merge pull request #14834 from alalek:videoio_gstreamer_issues
Alexander Alekhin [Thu, 20 Jun 2019 10:51:57 +0000 (13:51 +0300)]
videoio(gstreamer): port changes from 14834
Alexander Alekhin [Fri, 21 Jun 2019 10:26:09 +0000 (10:26 +0000)]
Merge pull request #14836 from alalek:static_analysis_issues_3.4
Cameron Martin [Thu, 11 Apr 2019 23:13:12 +0000 (00:13 +0100)]
js: Add findHomography js bindings.
Removed constants from legacy C api and switched out header with shorter version.
Removed blank line that was failing CI.
Alexander Alekhin [Thu, 20 Jun 2019 19:01:32 +0000 (19:01 +0000)]
Merge pull request #14737 from Wenzhao-Xiang:master
Thang Tran [Thu, 20 Jun 2019 17:56:23 +0000 (19:56 +0200)]
js: added fillPoly() and fillConvexPoly()