platform/upstream/opencv.git
4 years agoMerge pull request #15950 from alalek:ffmpeg_update_master
Alexander Alekhin [Wed, 20 Nov 2019 07:32:06 +0000 (07:32 +0000)]
Merge pull request #15950 from alalek:ffmpeg_update_master

4 years agoffmpeg/4.x: update FFmpeg plugin
Alexander Alekhin [Tue, 19 Nov 2019 22:04:44 +0000 (22:04 +0000)]
ffmpeg/4.x: update FFmpeg plugin

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 19 Nov 2019 19:13:38 +0000 (19:13 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #15939 from alalek:ffmpeg_update_3.4
Alexander Alekhin [Tue, 19 Nov 2019 18:45:39 +0000 (18:45 +0000)]
Merge pull request #15939 from alalek:ffmpeg_update_3.4

4 years agoMerge pull request #15918 from alalek:python_debug_parameter
Alexander Alekhin [Tue, 19 Nov 2019 18:39:56 +0000 (18:39 +0000)]
Merge pull request #15918 from alalek:python_debug_parameter

4 years agoMerge pull request #15925 from alalek:core_test_simd_cpp_emulation
Alexander Alekhin [Tue, 19 Nov 2019 18:08:45 +0000 (21:08 +0300)]
Merge pull request #15925 from alalek:core_test_simd_cpp_emulation

core(test): extending tests with SIMD C++ emulation code (intrin_cpp.hpp)

* core(test): test SIMD CPP emulation code (intrin_cpp.hpp)

* core(simd): eliminate build warnings from intrin_cpp.hpp

4 years agoMerge pull request #15946 from alalek:fix_js_test_features2d
Alexander Alekhin [Tue, 19 Nov 2019 14:25:28 +0000 (14:25 +0000)]
Merge pull request #15946 from alalek:fix_js_test_features2d

4 years agoMerge pull request #15945 from alalek:dnn_ie_extension_handling
Alexander Alekhin [Tue, 19 Nov 2019 14:25:12 +0000 (14:25 +0000)]
Merge pull request #15945 from alalek:dnn_ie_extension_handling

4 years agoMerge pull request #15919 from alalek:python_fix_arginfo
Alexander Alekhin [Tue, 19 Nov 2019 13:24:58 +0000 (13:24 +0000)]
Merge pull request #15919 from alalek:python_fix_arginfo

4 years agoMerge pull request #15935 from rgarnov:rg/fix_own_mat_empty
Alexander Alekhin [Tue, 19 Nov 2019 11:08:19 +0000 (11:08 +0000)]
Merge pull request #15935 from rgarnov:rg/fix_own_mat_empty

4 years agojs(test): update features2d test
Alexander Alekhin [Tue, 19 Nov 2019 07:40:12 +0000 (07:40 +0000)]
js(test): update features2d test

4 years agodnn: update InferenceEngine extension handling
Alexander Alekhin [Tue, 19 Nov 2019 06:55:14 +0000 (06:55 +0000)]
dnn: update InferenceEngine extension handling

4 years agoffmpeg/3.4: update FFmpeg wrapper
Alexander Alekhin [Mon, 18 Nov 2019 19:13:45 +0000 (19:13 +0000)]
ffmpeg/3.4: update FFmpeg wrapper

4 years agovideoio: fix ffmpeg wrapper build
Alexander Alekhin [Mon, 18 Nov 2019 18:56:57 +0000 (18:56 +0000)]
videoio: fix ffmpeg wrapper build

4 years agoMerge pull request #15938 from alalek:backport_15290
Alexander Alekhin [Mon, 18 Nov 2019 18:26:00 +0000 (18:26 +0000)]
Merge pull request #15938 from alalek:backport_15290

4 years agoMerge pull request #15937 from clunietp:3.4-fix-13577
Alexander Alekhin [Mon, 18 Nov 2019 18:23:48 +0000 (18:23 +0000)]
Merge pull request #15937 from clunietp:3.4-fix-13577

4 years agovideoio: retrieve encoded frames through FFmpeg backend
cudawarped [Mon, 18 Nov 2019 14:07:06 +0000 (14:07 +0000)]
videoio: retrieve encoded frames through FFmpeg backend

- backport 15290
- add extra test case

4 years agoMerge pull request #15290 from cudawarped:ffmpeg_raw_retrieve
cudawarped [Mon, 18 Nov 2019 14:07:06 +0000 (14:07 +0000)]
Merge pull request #15290 from cudawarped:ffmpeg_raw_retrieve

Add retrieve encoded frame to VideoCapture

* Add capacity to retrieve the encoded frame from a VideoCapture object.

* Correct raw codec and pixle format output from ffmpeg capture.

* Remove warnings from build.

* Added VideoCaptureRaw subclass.

* Include abstract base class VideoCaptureBase and rename new subclass VideoContainer as suggested by mshabunin.

* Remove using.

* Change base class name for compatibility with jave bindings generator.

* Move grab and retrieve and add override specifier

* Add setRaw and readRaw to IVideoCapture interface
-setRaw to disable video decoding and enable bitstream filters from mp4 to h254 and h265.
-readRaw to return the raw undecoded/filtered bitstream.
Add createRawCapture to initiate a backend with setRaw enabled.
Remove inheritance and use an independant VideoContainer subclass with IVideoCapture member.

* Address unused parameter warings.
Remove VideoContainer from python bindings as it no longer returns a Mat.
Use opencv type uchar instead of unsigned char.
Add missing destructor to VideoContainer class.

* Address build warnings and include all params in documentation.

* Include deprecated bitstream filtering API.

* Update codec_id query to work with older ffmpeg api's.
Change api version defines to be consistent - most recent api version first.

* Fix typo.

* Update test to work with naming of new files in the extra repo

* Investigate test failure

* Check bytes read by ffmpeg

* Removed mp4 video container test

* Applied suggested changes.

* videoio: rework API for extraction of RAW video streams

- FFmpeg only

* address review comments

4 years agoFixed own::Mat::empty() for non md case
Ruslan Garnov [Mon, 18 Nov 2019 12:39:10 +0000 (15:39 +0300)]
Fixed own::Mat::empty() for non md case

4 years agoFix 13577
clunietp [Mon, 18 Nov 2019 12:41:34 +0000 (07:41 -0500)]
Fix 13577

4 years agoMerge pull request #15888 from OrestChura:facebeautification_gapi_sample
Orest Chura [Mon, 18 Nov 2019 12:13:05 +0000 (15:13 +0300)]
Merge pull request #15888 from OrestChura:facebeautification_gapi_sample

Introducing the sample of Face Beautification algorithm implemented via Graph-API

* Introducing the sample of Face Beautification algorithm implemented via Graph-API
- 'gapi/samples/face_beautification.cpp' added
- FIXME added in 'gcpukernel.hpp'

* INF_ENGINE fix
- preprocessing clauses added not to run the sample without Inference Engine

* INF_ENGINE fix 2
- warnings removed

* Fixes
- checking IE version cut as there is no dependency
- some alignments fixed
- the comment about preprocessing commands fixed

* ie::backend() issue fix (according to dmatveev)
- as the sample needs the cv::gapi::ie::backend() to be defined regardless of having IE or not, there is its throw-error definition in `giebackend.cpp` now (by dmatveev)
- for the same reason, #includes in `giebackend.hpp` are fixed
- HAVE_INF_ENGINE check is removed from the sample

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 17 Nov 2019 22:51:16 +0000 (22:51 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoimgproc: fix bit-exact GaussianBlur() / sepFilter2D() (#15855)
Alexander Alekhin [Sun, 17 Nov 2019 22:39:27 +0000 (01:39 +0300)]
imgproc: fix bit-exact GaussianBlur() / sepFilter2D() (#15855)

* imgproc: fix bit-exact GaussianBlur() / sepFilter2D()

- avoid kernels with bad approximation
- GaussiabBlur - apply error-diffusion approximation for kernel (8-bit fraction)

* java(test): update features2d ref data

* test: update test_facedetect

4 years agoMerge pull request #15503 from cancerberoSgx:js-test-puppeteer
Sebastián Gurin [Sat, 16 Nov 2019 21:29:38 +0000 (18:29 -0300)]
Merge pull request #15503 from cancerberoSgx:js-test-puppeteer

Js test puppeteer

* run_puppeteer.js / tests

* js run test section

* rollback html

* whitespace

* js: update OpenCV.js tests infrastructure

* js: exclude puppeteer from default 'npm install'

* js: update notes

* js: more fixes in run_puppeteer

* fix build folder

4 years agoMerge pull request #15917 from ChipKerchner:demosaicingToHal2
Alexander Alekhin [Sat, 16 Nov 2019 19:45:37 +0000 (19:45 +0000)]
Merge pull request #15917 from ChipKerchner:demosaicingToHal2

4 years agoMerge pull request #15100 from Volskig:cam_multiplexing_function_v
Maxim Pashchenkov [Fri, 15 Nov 2019 16:42:12 +0000 (19:42 +0300)]
Merge pull request #15100 from Volskig:cam_multiplexing_function_v

Implement Camera Multiplexing API

* IdideoCapture + two wrong function

function waitAny

Add errors catcher

Stub for Python added.

Sifting warnings

One test added

Two tests for camera and Perf tests added

* Perf sync and async tests for waitAny() added, waitAnyInterior() deleted, getDeviceHandle() deleted

* Variable OPENCV_TEST_CAMERA_LIST added

* Without fps set

* ASSERT_FAILED for environment variable

* Perf tests is DISABLED_

* --Trailing whitespace

* Return false from cap.cpp deleted

* Two functions deleted from interface, +range for, +environment variable in test_camera

* Space deleted

* printf deleted, perror added

* CV_WRAP deleted, cv2 cleared from stubs

* -- space

* default timeout added

* @param changed

* place of waitAny changed

* --whitespace

* ++function description

* function description changed

* revert unused changes

* videoio: rework API for VideoCapture::waitAny()

4 years agopython: force using of ArgInfo
Alexander Alekhin [Fri, 15 Nov 2019 14:29:51 +0000 (17:29 +0300)]
python: force using of ArgInfo

4 years agopython: emit bindings conversion failures on OPENCV_PYTHON_DEBUG=1
Alexander Alekhin [Fri, 15 Nov 2019 15:37:56 +0000 (18:37 +0300)]
python: emit bindings conversion failures on OPENCV_PYTHON_DEBUG=1

4 years agoConvert demosiacing with variable number of gradients to HAL - 5.5x faster
ChipKerchner [Fri, 15 Nov 2019 13:42:03 +0000 (07:42 -0600)]
Convert demosiacing with variable number of gradients to HAL - 5.5x faster

4 years agoMerge pull request #15911 from l-bat:fix_reducel2
Alexander Alekhin [Fri, 15 Nov 2019 11:04:05 +0000 (11:04 +0000)]
Merge pull request #15911 from l-bat:fix_reducel2

4 years agoMerge pull request #15852 from akhakim:gauss_blur_kernel_5x5
Alexander Alekhin [Thu, 14 Nov 2019 14:55:24 +0000 (14:55 +0000)]
Merge pull request #15852 from akhakim:gauss_blur_kernel_5x5

4 years agoMerge pull request #15896 from alalek:build_gcc_9
Alexander Alekhin [Thu, 14 Nov 2019 14:22:01 +0000 (14:22 +0000)]
Merge pull request #15896 from alalek:build_gcc_9

4 years agoMerge pull request #15906 from anton-potapov:gapi_fluid_i420_support
Alexander Alekhin [Thu, 14 Nov 2019 14:07:05 +0000 (14:07 +0000)]
Merge pull request #15906 from anton-potapov:gapi_fluid_i420_support

4 years agoFix ReduceL2
Liubov Batanina [Thu, 14 Nov 2019 12:30:53 +0000 (15:30 +0300)]
Fix ReduceL2

4 years agoGAPI Fluid: SIMD optimization for sep filters 5x5 kernel size (gaussBlur)
Anna Khakimova [Fri, 8 Nov 2019 08:15:40 +0000 (11:15 +0300)]
GAPI Fluid: SIMD optimization for sep filters 5x5 kernel size (gaussBlur)

4 years agoMerge pull request #15905 from alalek:issue_15904
Alexander Alekhin [Thu, 14 Nov 2019 10:33:29 +0000 (10:33 +0000)]
Merge pull request #15905 from alalek:issue_15904

4 years agoG-API (Fluid) core support for I420
Anton Potapov [Wed, 13 Nov 2019 12:05:56 +0000 (15:05 +0300)]
G-API (Fluid) core support for I420

- Extended NV12 support in Fluid Core engine to cover I420

4 years agoMerge pull request #15900 from komakai:fix-osx-build
Alexander Alekhin [Wed, 13 Nov 2019 17:02:08 +0000 (17:02 +0000)]
Merge pull request #15900 from komakai:fix-osx-build

4 years agoMerge pull request #15425 from cancerberoSgx:nodejs
Sebastián Gurin [Wed, 13 Nov 2019 15:14:53 +0000 (12:14 -0300)]
Merge pull request #15425 from cancerberoSgx:nodejs

JS - adds a tutorial about running opencv.js in Node.js

4 years agoMerge pull request #15874 from akhakim:runsepfilter_5x5_kernel_size
Alexander Alekhin [Wed, 13 Nov 2019 14:53:14 +0000 (14:53 +0000)]
Merge pull request #15874 from akhakim:runsepfilter_5x5_kernel_size

4 years agoFix MacOS build
Giles Payne [Tue, 12 Nov 2019 23:30:30 +0000 (08:30 +0900)]
Fix MacOS build

4 years agoimgproc(IPP): disable ippiDistanceTransform_3x3_8u32f_C1R
Alexander Alekhin [Wed, 13 Nov 2019 11:13:17 +0000 (14:13 +0300)]
imgproc(IPP): disable ippiDistanceTransform_3x3_8u32f_C1R

4 years agoMerge pull request #15891 from alalek:issue_15886
Alexander Alekhin [Tue, 12 Nov 2019 22:57:15 +0000 (22:57 +0000)]
Merge pull request #15891 from alalek:issue_15886

4 years agoMerge pull request #15883 from cbachhuber:refactor-opencl-information
Alexander Alekhin [Tue, 12 Nov 2019 22:56:51 +0000 (22:56 +0000)]
Merge pull request #15883 from cbachhuber:refactor-opencl-information

4 years agoRefactor for clarity and avoiding code duplication
Christoph Bachhuber [Sun, 10 Nov 2019 12:18:57 +0000 (13:18 +0100)]
Refactor for clarity and avoiding code duplication

Implement GArik's comments

Remove unnecessary c_str()

Fix brace position

4 years agobuild: GCC9 compilation
Alexander Alekhin [Mon, 11 Nov 2019 14:20:07 +0000 (17:20 +0300)]
build: GCC9 compilation

4 years agoGAPI Fluid: The run_sepfilter() has logic error into handler for 5x5 and larger kernels
Anna Khakimova [Fri, 8 Nov 2019 13:45:10 +0000 (16:45 +0300)]
GAPI Fluid: The run_sepfilter() has logic error into handler for 5x5 and larger kernels

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 11 Nov 2019 18:24:05 +0000 (18:24 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agocmake: set _WIN32_WINNT for Windows 7 API
Alexander Alekhin [Mon, 11 Nov 2019 20:19:40 +0000 (20:19 +0000)]
cmake: set _WIN32_WINNT for Windows 7 API

4 years agoMerge pull request #15875 from gyadam:fix-windows-install-doc
Alexander Alekhin [Sun, 10 Nov 2019 09:35:59 +0000 (09:35 +0000)]
Merge pull request #15875 from gyadam:fix-windows-install-doc

4 years agoMerge pull request #15877 from mshabunin:fix-gst-relative-34
Alexander Alekhin [Sun, 10 Nov 2019 09:25:29 +0000 (09:25 +0000)]
Merge pull request #15877 from mshabunin:fix-gst-relative-34

4 years agoMerge pull request #15835 from alalek:cmake_cpu_optimizations_fix_15802
Alexander Alekhin [Sun, 10 Nov 2019 09:22:45 +0000 (09:22 +0000)]
Merge pull request #15835 from alalek:cmake_cpu_optimizations_fix_15802

4 years agoMerge pull request #15826 from alalek:cmake_fix_itt_define_condition
Alexander Alekhin [Sun, 10 Nov 2019 09:22:22 +0000 (09:22 +0000)]
Merge pull request #15826 from alalek:cmake_fix_itt_define_condition

4 years agoFixed relative paths handling in cap_gstreamer:
Maksim Shabunin [Sat, 9 Nov 2019 11:19:23 +0000 (11:19 +0000)]
Fixed relative paths handling in cap_gstreamer:

4 years agoMerge pull request #15811 from l-bat:eltwise_div
Lubov Batanina [Sat, 9 Nov 2019 11:11:09 +0000 (14:11 +0300)]
Merge pull request #15811 from l-bat:eltwise_div

Supported ONNX Squeeze, ReduceL2 and Eltwise::DIV

* Support eltwise div

* Fix test

* OpenCL support added

* refactoring

* fix code style

* Only squeeze with axes supported

4 years agoFix Windows installation script error
Adam Gyarmati [Sat, 9 Nov 2019 03:05:46 +0000 (19:05 -0800)]
Fix Windows installation script error

Fix an error during Windows installation caused by trying to create the already existing Build directory. Also excluding intermediate steps for Install directory creation.

4 years agoMerge pull request #15861 from dkurt:dnn_fix_get_input_layers
Alexander Alekhin [Fri, 8 Nov 2019 22:01:07 +0000 (22:01 +0000)]
Merge pull request #15861 from dkurt:dnn_fix_get_input_layers

4 years agoMerge pull request #15319 from cancerberoSgx:fs
Alexander Alekhin [Fri, 8 Nov 2019 13:20:09 +0000 (13:20 +0000)]
Merge pull request #15319 from cancerberoSgx:fs

4 years agoexpose FS
Sebastián Gurín [Fri, 16 Aug 2019 02:09:37 +0000 (23:09 -0300)]
expose FS

4 years agoMerge pull request #15832 from collinbrake:feature_grammar_fixes_4
collinbrake [Fri, 8 Nov 2019 09:27:37 +0000 (04:27 -0500)]
Merge pull request #15832 from collinbrake:feature_grammar_fixes_4

* Grammar fixes for python core operations docs

* fixed whitespace error

* reverted changes

4 years agoMerge pull request #15848 from alalek:backport_test_15842
Alexander Alekhin [Thu, 7 Nov 2019 16:48:41 +0000 (16:48 +0000)]
Merge pull request #15848 from alalek:backport_test_15842

4 years agoMerge pull request #15868 from alalek:issue_15857
Alexander Alekhin [Thu, 7 Nov 2019 14:21:35 +0000 (14:21 +0000)]
Merge pull request #15868 from alalek:issue_15857

4 years agoMerge pull request #15866 from mshabunin:add-security-md
Alexander Alekhin [Thu, 7 Nov 2019 14:04:33 +0000 (14:04 +0000)]
Merge pull request #15866 from mshabunin:add-security-md

4 years agoMerge pull request #15867 from mshabunin:fix-gapi-install
Alexander Alekhin [Thu, 7 Nov 2019 13:49:34 +0000 (13:49 +0000)]
Merge pull request #15867 from mshabunin:fix-gapi-install

4 years agocore(persistence): add more checks for implementation limitations
Alexander Alekhin [Thu, 7 Nov 2019 11:01:51 +0000 (14:01 +0300)]
core(persistence): add more checks for implementation limitations

4 years agoInstall: added missing gapi headers
Maksim Shabunin [Thu, 7 Nov 2019 11:03:46 +0000 (14:03 +0300)]
Install: added missing gapi headers

4 years agoAdded SECURITY.md
Maksim Shabunin [Thu, 7 Nov 2019 10:10:42 +0000 (13:10 +0300)]
Added SECURITY.md

4 years agoFix dnn::getLayerInputs
Dimitri Gerin [Wed, 6 Nov 2019 18:05:35 +0000 (21:05 +0300)]
Fix dnn::getLayerInputs

4 years agoMerge pull request #15854 from czgdp1807:rem-typo
Alexander Alekhin [Wed, 6 Nov 2019 13:47:37 +0000 (13:47 +0000)]
Merge pull request #15854 from czgdp1807:rem-typo

4 years agoMerge pull request #15159 from SSE4:fix_find_openexr
Alexander Smorkalov [Wed, 6 Nov 2019 13:37:37 +0000 (13:37 +0000)]
Merge pull request #15159 from SSE4:fix_find_openexr

4 years agoremoved typo
czgdp1807 [Wed, 6 Nov 2019 11:45:31 +0000 (17:15 +0530)]
removed typo

4 years ago- fix FindOpenEXR to respect OPENEXR_ROOT
SSE4 [Tue, 5 Nov 2019 09:13:21 +0000 (16:13 +0700)]
- fix FindOpenEXR to respect OPENEXR_ROOT

Signed-off-by: SSE4 <tomskside@gmail.com>
4 years agoMerge pull request #15814 from i-murzov:3.4-ocl-cleanup
Alexander Alekhin [Wed, 6 Nov 2019 09:54:29 +0000 (09:54 +0000)]
Merge pull request #15814 from i-murzov:3.4-ocl-cleanup

4 years agoMerge pull request #15813 from i-murzov:3.4-ocl-empty-platform
Alexander Alekhin [Wed, 6 Nov 2019 08:12:40 +0000 (08:12 +0000)]
Merge pull request #15813 from i-murzov:3.4-ocl-empty-platform

4 years agoFix OpenCL device detection when some OpenCL platform has no devices
Igor Murzov [Wed, 30 Oct 2019 15:24:32 +0000 (18:24 +0300)]
Fix OpenCL device detection when some OpenCL platform has no devices

It's not an error if some OpenCL platform has no devices. This makes
OpenCL device detection work correctly in the following scenario:

$ OPENCV_OPENCL_DEVICE=:GPU: ./opencv_test_dnn

OpenCV version: 4.1.2-dev
OpenCV VCS version: 4.1.2-80-g467748ee98-dirty
Build type: Debug
Compiler: /usr/bin/g++  (ver 7.4.0)
Parallel framework: pthreads
CPU features: SSE SSE2 SSE3 *SSE4.1 *SSE4.2 *FP16 *AVX *AVX2 *AVX512-SKX?
Intel(R) IPP version: ippIP AVX2 (l9) 2019.0.0 Gold (-) Jul 24 2018
OpenCL Platforms:
    AMD Accelerated Parallel Processing
    Portable Computing Language
        CPU: pthread-AMD Ryzen 7 2700X Eight-Core Processor (OpenCL 1.2 pocl HSTR: pthread-x86_64-pc-linux-gnu-znver1)
    NVIDIA CUDA
        dGPU: GeForce GTX 1080 (OpenCL 1.2 CUDA)
Current OpenCL device:
    Type = dGPU
    Name = GeForce GTX 1080
    Version = OpenCL 1.2 CUDA
    Driver version = 430.26

4 years agoMerge pull request #15851 from alalek:fixup_15842
Alexander Alekhin [Tue, 5 Nov 2019 16:21:04 +0000 (16:21 +0000)]
Merge pull request #15851 from alalek:fixup_15842

4 years agoMerge pull request #15828 from ChipKerchner:momentsToHal
Chip Kerchner [Tue, 5 Nov 2019 15:52:35 +0000 (10:52 -0500)]
Merge pull request #15828 from ChipKerchner:momentsToHal

* Convert moments in tile algorithms to HAL (1.3x faster for VSX).

* Adding NEON code back in for non 64-bit platforms.

* Remove floats from post processing.

4 years agocore(test): add test for YAML parse multiple documents
TH3CHARLie [Mon, 4 Nov 2019 13:27:48 +0000 (21:27 +0800)]
core(test): add test for YAML parse multiple documents

- added removal of temporary file

4 years agocore(persistence): fix processing of multiple documents
Alexander Alekhin [Tue, 5 Nov 2019 15:28:15 +0000 (18:28 +0300)]
core(persistence): fix processing of multiple documents

4 years agorevert changes in modules/core/src/persistence_yml.cpp (PR15842)
Alexander Alekhin [Tue, 5 Nov 2019 15:22:42 +0000 (18:22 +0300)]
revert changes in modules/core/src/persistence_yml.cpp (PR15842)

4 years agoSimplify OpenCL info dumping code:
Igor Murzov [Wed, 30 Oct 2019 15:35:38 +0000 (18:35 +0300)]
Simplify OpenCL info dumping code:

* Reduce code nesting
* Drop redundant .c_str() calls

4 years agoMerge pull request #15842 from TH3CHARLie:yaml-fix
TH3CHARLie [Mon, 4 Nov 2019 13:27:48 +0000 (21:27 +0800)]
Merge pull request #15842 from TH3CHARLie:yaml-fix

* fix yaml parse

* add test for YAML parse multiple documents

* remove trailing whitespace in test

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 4 Nov 2019 09:58:29 +0000 (09:58 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #15838 from oleg-alexandrov:patch-2
Oleg Alexandrov [Sun, 3 Nov 2019 13:37:25 +0000 (05:37 -0800)]
Merge pull request #15838 from oleg-alexandrov:patch-2

Correct stereoRectify documentation

4 years agoMerge pull request #15834 from berak:python_fix_type_error
Alexander Alekhin [Sat, 2 Nov 2019 18:50:46 +0000 (18:50 +0000)]
Merge pull request #15834 from berak:python_fix_type_error

4 years agocmake(cpu optmizations): fix cleanup of OPENCV_DEPENDANT_TARGETS_* vars
Alexander Alekhin [Sat, 2 Nov 2019 10:32:23 +0000 (10:32 +0000)]
cmake(cpu optmizations): fix cleanup of OPENCV_DEPENDANT_TARGETS_* vars

4 years agopython: fix type error msg
berak [Sat, 2 Nov 2019 07:17:07 +0000 (08:17 +0100)]
python: fix type error msg

4 years agoMerge pull request #15821 from ColasGael:colasg-viz-color
Gael Colas [Fri, 1 Nov 2019 19:37:34 +0000 (12:37 -0700)]
Merge pull request #15821 from ColasGael:colasg-viz-color

Fix wrong definition of viz::Color::navy()

4 years agoMerge pull request #15820 from oleg-alexandrov:patch-1
Oleg Alexandrov [Fri, 1 Nov 2019 19:34:11 +0000 (12:34 -0700)]
Merge pull request #15820 from oleg-alexandrov:patch-1

Clarify stereoRectify() doc

The function stereoRectify() takes as input a coordinate transform between two cameras. It is ambiguous how it goes. I clarified that it goes from the second camera to the first.

4 years agoMerge pull request #15812 from yuriyluxriot:fls_replaces_tls
yuriyluxriot [Fri, 1 Nov 2019 19:33:12 +0000 (21:33 +0200)]
Merge pull request #15812 from yuriyluxriot:fls_replaces_tls

* Use FlsAlloc/FlsFree/FlsGetValue/FlsSetValue instead of TlsAlloc/TlsFree/TlsGetValue/TlsSetValue to implment TLS value cleanup when thread has been terminated on Windows Vista and above

* Fix 32-bit build

* Fixed calling convention of cleanup callback

* WINAPI changed to NTAPI

* Use proper guard macro

4 years agoMerge pull request #15555 from ChipKerchner:flipVectorize
Chip Kerchner [Fri, 1 Nov 2019 19:30:48 +0000 (15:30 -0400)]
Merge pull request #15555 from ChipKerchner:flipVectorize

* Vectorize flipHoriz and flipVert functions.

* Change v_load_mirror_1 to use vec_revb for VSX

* Only use vec_revb in ISA3.0

* Removing vec_revb code since some of the older compilers don't fully support it.

* Use new v_reverse intrinsic and cleanup code.

* Ensure there are no alignment issues with copies

4 years agoMerge pull request #15831 from alalek:fix_pylint_master
Alexander Alekhin [Fri, 1 Nov 2019 16:07:15 +0000 (19:07 +0300)]
Merge pull request #15831 from alalek:fix_pylint_master

4 years agopylint: eliminate warnings
Alexander Alekhin [Fri, 1 Nov 2019 15:59:35 +0000 (18:59 +0300)]
pylint: eliminate warnings

4 years agocmake: fix ITT define condition
Alexander Alekhin [Fri, 1 Nov 2019 12:07:49 +0000 (15:07 +0300)]
cmake: fix ITT define condition

4 years agoMerge pull request #15819 from alalek:ts_unblock_reporting_of_disabled_tests
Alexander Alekhin [Thu, 31 Oct 2019 20:39:41 +0000 (20:39 +0000)]
Merge pull request #15819 from alalek:ts_unblock_reporting_of_disabled_tests

4 years agoMerge pull request #15805 from i-murzov:3.4
Alexander Alekhin [Thu, 31 Oct 2019 20:39:16 +0000 (20:39 +0000)]
Merge pull request #15805 from i-murzov:3.4

4 years agoMerge pull request #15799 from Cpitis:feature/parallelization
Ciprian Alexandru Pitis [Thu, 31 Oct 2019 20:38:49 +0000 (21:38 +0100)]
Merge pull request #15799 from Cpitis:feature/parallelization

Parallelize pyrDown & calcSharrDeriv

* ::pyrDown has been parallelized

* CalcSharrDeriv parallelized

* Fixed whitespace

* Set granularity based on amount of threads enabled

* Granularity changed to cv::getNumThreads, now each thread should receive 1/n sized stripes

* imgproc: move PyrDownInvoker<CastOp>::operator() implementation

* imgproc(pyramid): remove syloopboundary()

* video: SharrDerivInvoker replace 'Mat*' => 'Mat&' fields

4 years agoMerge pull request #15789 from CJSmith-0141:15779-scale-bug-in-stereo-match-sample
CJ Smith [Thu, 31 Oct 2019 19:29:04 +0000 (15:29 -0400)]
Merge pull request #15789 from CJSmith-0141:15779-scale-bug-in-stereo-match-sample

* Changes disparity image to float representation

Signed-off-by: Connor James Smith <cjs.connor.smith@gmail.com>
* samples: update disparity multiplier handling in stereo_match.cpp

4 years agoMerge pull request #15780 from oleg-alexandrov:master
Oleg Alexandrov [Thu, 31 Oct 2019 19:28:01 +0000 (12:28 -0700)]
Merge pull request #15780 from oleg-alexandrov:master

* Doc bugfix

The documentation page StereoBinaryBM and StereoBinarySGBM says that it returns a disparity that is scaled multiplied by 16. This scaling must be undone before calling reprojectImageTo3D, otherwise the results are wrong. The function reprojectImageTo3D() could do this scaling internally, maybe, but at least the documentation must explain that this has to be done.

* calib3d: update reprojectImageTo3D documentation

* calib3d: add StereoBM/StereoSGBM into notes list

4 years agoMerge pull request #15478 from terfendail:wintr_stereosgbm
Alexander Alekhin [Thu, 31 Oct 2019 19:24:06 +0000 (19:24 +0000)]
Merge pull request #15478 from terfendail:wintr_stereosgbm