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: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 [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
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()
Alexander Alekhin [Thu, 20 Jun 2019 16:28:53 +0000 (19:28 +0300)]
core: eliminate AVX512 build warnings
from MSVS2017 and GCC8 -O1 mode
Joe Howse [Thu, 20 Jun 2019 16:56:29 +0000 (13:56 -0300)]
core: revise syntax to support Visual C++ 2013
Alexander Alekhin [Thu, 20 Jun 2019 13:43:28 +0000 (16:43 +0300)]
test: fix usage of findDataFile()
misused 'optional' mode
Alexander Alekhin [Mon, 17 Jun 2019 16:33:02 +0000 (19:33 +0300)]
videoio: refactor GStreamer backend
- exception safe smart pointers, fixed many memory leaks
- fixed errors handling
- fixed strings handling
- fixed file existence check
- fixed toFraction() implementation
- add 'drop=true' for v4l2 input
- avoid overriding custom pipelines sink's 'max-buffers' value
- updated valgrind supression rules
- added support for GStreamer native leaks tracking (via gst_deinit() call)
- repaired capturing through GStreamer0.10 (fixed CV_8UC1)
Alexander Alekhin [Tue, 18 Jun 2019 14:25:43 +0000 (17:25 +0300)]
videoio(test): avoid raw ptr in ffmpeg tests
causes leaks if FFmpeg is disabled through OPENCV_VIDEOIO_PRIORITY_FFMPEG=0
Alexander Alekhin [Tue, 18 Jun 2019 12:35:16 +0000 (15:35 +0300)]
core: backport toLowerCase()/toUpperCase()
Alexander Alekhin [Mon, 17 Jun 2019 20:47:41 +0000 (20:47 +0000)]
videoio(test): add extra videoio tests
Alexander Alekhin [Thu, 20 Jun 2019 13:48:05 +0000 (13:48 +0000)]
Merge pull request #14689 from anton-potapov:gapi_async_cacnel
Alexander Alekhin [Thu, 20 Jun 2019 12:52:07 +0000 (12:52 +0000)]
Merge pull request #14844 from rgarnov:gapi_contains_tuple
Ruslan Garnov [Thu, 20 Jun 2019 11:36:16 +0000 (14:36 +0300)]
Added overload of contains<> for tuple
Alexander Alekhin [Wed, 19 Jun 2019 16:04:51 +0000 (19:04 +0300)]
static analysis issues
Anton Potapov [Fri, 31 May 2019 14:22:12 +0000 (17:22 +0300)]
Cancelation support fo Async GAPI
-
Alexander Alekhin [Mon, 17 Jun 2019 14:47:48 +0000 (14:47 +0000)]
Merge pull request #14774 from alalek:videoio_ffmpeg_plugin_win32
Alexander Alekhin [Mon, 17 Jun 2019 13:54:53 +0000 (13:54 +0000)]
Merge pull request #14816 from gal0is:gal0is-branch
Alexey Smirnov [Mon, 17 Jun 2019 13:26:28 +0000 (16:26 +0300)]
Merge pull request #14648 from smirnov-alexey:as/gapi_transform
* Introduce GAPI_TRANSFORM initial interface
Comes along with simple tests and kernel package changes
* Fix documentation and adjust combine() function
* Fix stuff after rebasing on master
* Remove redundant functionality
* Refactoring according to review feedback provided
* Fixes according to review feedback
* Reconsider transformations return and fix a warning
* Fixes from code review
* Add a new simple test
* Cleanup, added tests on GScalar, GMatP, GArray
Alexander Alekhin [Sun, 16 Jun 2019 14:41:04 +0000 (14:41 +0000)]
ffmpeg: win32 wrapper update
Alexander Alekhin [Fri, 31 May 2019 13:18:00 +0000 (16:18 +0300)]
videoio: plugins support on Win32
gal0is [Sat, 15 Jun 2019 15:51:13 +0000 (23:51 +0800)]
Solve the import issue in Python2.
Alexander Alekhin [Sat, 15 Jun 2019 16:25:11 +0000 (16:25 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 15 Jun 2019 16:18:57 +0000 (16:18 +0000)]
Merge pull request #14815 from alalek:valgrind_suppress_openexr_threadpool
Alexander Alekhin [Sat, 15 Jun 2019 14:38:37 +0000 (14:38 +0000)]
valgrind: suppress OpenEXR ThreadPool
Alexander Alekhin [Fri, 14 Jun 2019 22:44:43 +0000 (22:44 +0000)]
Merge pull request #14808 from alalek:issue_14807
Kang Yifei [Fri, 14 Jun 2019 19:57:21 +0000 (03:57 +0800)]
Merge pull request #14800 from FanaticsKang:add_undistortPoint_test
Test request by #14583 (#14800)
* add test to show the undistort bug
* move test to calib3d
Alexander Alekhin [Fri, 14 Jun 2019 18:30:25 +0000 (18:30 +0000)]
Merge pull request #14583 from FanaticsKang:fix_undistortPoint_bug
Alexander Alekhin [Fri, 14 Jun 2019 16:41:55 +0000 (16:41 +0000)]
Merge pull request #14747 from dkurt:fix_14683
Ruslan Garnov [Fri, 14 Jun 2019 16:27:19 +0000 (19:27 +0300)]
Merge pull request #14741 from rgarnov:gapi_fix_includes
Changed quotes to brackets when including public includes (#14741)
Alexander Alekhin [Fri, 14 Jun 2019 16:07:54 +0000 (19:07 +0300)]
cmake: typo in hook name
Kang [Sun, 19 May 2019 07:14:20 +0000 (15:14 +0800)]
fix the bug, when k[4] is negative, icdist may be negative at the edge of image.
Dmitry Kurtaev [Thu, 6 Jun 2019 16:08:45 +0000 (19:08 +0300)]
dnn: fix MVN layer (issue 14683)
atalaman [Fri, 14 Jun 2019 15:29:50 +0000 (18:29 +0300)]
Merge pull request #14700 from TolyaTalamanov:at/cv_gapi_render
G-API: Render (#14700)
* cv::Render
Implement OCVRedner for BGR as input
* Support two plane cv::Render::run
* Snapshot
* Add RenderCreator
* text2Points
* Snapshot
* Refactoring tests
* Remove text2points
* Fix render input data type in tests
* Refactoring
* Fix headers
* Change struct fields name
* Fix headers
* Fix warnings
* Replace cv::Scalar -> cv::gapi::own::Scalar
* Add test
* PutText and rectangle case
* Fix comments to review
* Fix comments to review
* Fix comments to review
* Create render_priv.hpp
* Implement BGR2NV12
* Fix NV12 test
* Fix comments to review
* Add header for GAPI_Assert