Alexander Alekhin [Fri, 20 Sep 2019 21:11:49 +0000 (21:11 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 20 Sep 2019 21:07:24 +0000 (00:07 +0300)]
Merge pull request #15554 from alalek:pr15422_patch_files
* 3rdparty: libpng v1.6.37 MSA patch (pr15422)
original files: https://github.com/glennrp/libpng/tree/v1.6.37/mips
* 3rdparty: libwebp MSA asm patch (pr15422)
mipsopen-fwu [Fri, 20 Sep 2019 16:52:48 +0000 (00:52 +0800)]
Merge pull request #15422 from mipsopen-fwu:msa-dev
* Added MSA implementations for mips platforms. Intrinsics for MSA and build scripts for MIPS platforms are added.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Removed some unused code in mips.toolchain.cmake.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Added comments for mips toolchain configuration and disabled compiling warnings for libpng.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Fixed the build error of unsupported opcode 'pause' when mips isa_rev is less than 2.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Removed FP16 related item in MSA option defines in OpenCVCompilerOptimizations.cmake.
2. Use CV_CPU_COMPILE_MSA instead of __mips_msa for MSA feature check in cv_cpu_dispatch.h.
3. Removed hasSIMD128() in intrin_msa.hpp.
4. Define CPU_MSA as 150.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Removed unnecessary CV_SIMD128_64F guarding in intrin_msa.hpp.
2. Removed unnecessary CV_MSA related code block in dotProd_8u().
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* 1. Defined CPU_MSA_FLAGS_ON as "-mmsa".
2. Removed CV_SIMD128_64F guardings in intrin_msa.hpp.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
* Removed unused msa_mlal_u16() and msa_mlal_s16 from msa_macros.h.
Signed-off-by: Fei Wu <fwu@wavecomp.com>
Alexander Alekhin [Fri, 20 Sep 2019 16:41:41 +0000 (16:41 +0000)]
Merge pull request #15530 from sturkmen72:update_samples_v4
Suleyman TURKMEN [Mon, 19 Aug 2019 21:40:45 +0000 (00:40 +0300)]
Update samples
Alexander Alekhin [Wed, 18 Sep 2019 20:12:36 +0000 (20:12 +0000)]
Merge pull request #15540 from alalek:issue_15278_2
Alexander Alekhin [Wed, 18 Sep 2019 15:31:25 +0000 (15:31 +0000)]
Merge pull request #15519 from mshabunin:fix-custom-install
dab0bby [Wed, 18 Sep 2019 15:30:01 +0000 (17:30 +0200)]
Merge pull request #15477 from dab0bby:remove-old-build-java-option
* remove old BUILD_opencv_java option
* replace old build_java option with new BUILD_JAVA option
Alexander Alekhin [Wed, 18 Sep 2019 15:18:09 +0000 (15:18 +0000)]
cmake: use 'long long' for atomic check
Alexander Alekhin [Wed, 18 Sep 2019 12:19:14 +0000 (12:19 +0000)]
Merge pull request #15515 from dkurt:dnn_detection_model_fix
Alexander Alekhin [Wed, 18 Sep 2019 11:22:26 +0000 (11:22 +0000)]
Merge pull request #15516 from dkurt:dnn_detection_model_fix_3.4
Alexander Alekhin [Wed, 18 Sep 2019 11:19:59 +0000 (11:19 +0000)]
Merge pull request #15529 from collinbrake:feature_grammar_fixes
Maksim Shabunin [Tue, 17 Sep 2019 15:01:06 +0000 (15:01 +0000)]
Merge pull request #15531 from terfendail:disflow_fix
Alexander Alekhin [Tue, 17 Sep 2019 14:26:43 +0000 (14:26 +0000)]
Merge pull request #15399 from terfendail:perf_stereobm
Vitaly Tuzov [Tue, 17 Sep 2019 12:53:18 +0000 (15:53 +0300)]
Fixed out of bound reading in DIS optical flow evaluation implementation
collin [Mon, 16 Sep 2019 21:20:39 +0000 (17:20 -0400)]
Grammer fixes on python image display tutorial
Daniel Kapusi [Mon, 16 Sep 2019 21:04:05 +0000 (23:04 +0200)]
Merge pull request #15341 from DiebBlue:is5769
* issue 5769 fixed: cv::stereoRectify fails if given inliers mask of type vector<uchar>
* issue5769 fix using reshape and add regression test
* regression test with outlier detection, testing vector and mat data
* Size comparision of wrong vector within CV_Assert in regression test corrected
* cleanup test code
Alexander Alekhin [Mon, 16 Sep 2019 15:28:33 +0000 (15:28 +0000)]
Merge pull request #15517 from mshabunin:fix-osx-avfoundation-auth
Alexander Alekhin [Mon, 16 Sep 2019 15:24:29 +0000 (15:24 +0000)]
Merge pull request #15491 from terfendail:undistort_fix
Vitaly Tuzov [Tue, 10 Sep 2019 08:40:14 +0000 (11:40 +0300)]
Fixed universal intrinsic undistort() implementation
Maksim Shabunin [Fri, 13 Sep 2019 12:51:15 +0000 (15:51 +0300)]
Windows: partially restore install config generation
Alexander Alekhin [Fri, 13 Sep 2019 17:15:10 +0000 (17:15 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 13 Sep 2019 17:06:00 +0000 (17:06 +0000)]
Merge pull request #15518 from mshabunin:fix-osx-qt
Alexander Alekhin [Fri, 13 Sep 2019 17:04:52 +0000 (17:04 +0000)]
Merge pull request #15476 from cancerberoSgx:js-docker
Alexander Alekhin [Fri, 13 Sep 2019 17:03:28 +0000 (17:03 +0000)]
Merge pull request #15449 from mshabunin:cmake-download-params
Alexander Alekhin [Fri, 13 Sep 2019 16:57:34 +0000 (16:57 +0000)]
Merge pull request #15487 from dkurt:fix_ie_2019r1
Alexander Alekhin [Fri, 13 Sep 2019 16:48:18 +0000 (16:48 +0000)]
Merge pull request #15511 from pmur:vmuleo-fix-gcc7
Maksim Shabunin [Fri, 13 Sep 2019 12:23:59 +0000 (15:23 +0300)]
Fixed OSX build with Qt
Maksim Shabunin [Fri, 13 Sep 2019 10:20:29 +0000 (13:20 +0300)]
AVFoundation: backported runtime authorization check from master
Maksim Shabunin [Fri, 13 Sep 2019 10:11:35 +0000 (13:11 +0300)]
AVFoundation: fix authorization request not being shown
Dmitry Kurtaev [Fri, 13 Sep 2019 08:33:24 +0000 (11:33 +0300)]
Fix DetectionModel in case of out of [0, 1] range detection prediction
Dmitry Kurtaev [Fri, 13 Sep 2019 08:50:50 +0000 (11:50 +0300)]
Fix dnn object detection sample
Dmitry Kurtaev [Mon, 9 Sep 2019 16:24:54 +0000 (19:24 +0300)]
Fix OpenVINO 2019R1 compilation
Paul E. Murphy [Thu, 12 Sep 2019 14:45:56 +0000 (09:45 -0500)]
core: workaround old gcc vec_mul{e,o} (Issue #15506)
ISA 2.07 (aka POWER8) effectively extended the expanding multiply
operation to word types. The altivec intrinsics prior to gcc 8 did
not get the update.
Workaround this deficiency similar to other fixes.
This was exposed by commit
33fb253a66275abaa5060ef318c9a5cc87c5fd6e
which leverages the int -> dword expanding multiply.
This fixes Issue #15506
Alexander Alekhin [Tue, 10 Sep 2019 09:57:57 +0000 (09:57 +0000)]
Merge pull request #15468 from alalek:ffmpeg_update_master
Alexander Alekhin [Tue, 10 Sep 2019 09:57:38 +0000 (09:57 +0000)]
Merge pull request #15466 from alalek:ffmpeg_update_3.4
Alexander Alekhin [Thu, 5 Sep 2019 21:10:52 +0000 (21:10 +0000)]
ffmpeg/4.x: update FFmpeg plugin
ffmpeg: 4.1.3 -> 4.2.1
libvpx: 1.8.0 -> 1.8.1
Maksim Shabunin [Mon, 9 Sep 2019 19:27:58 +0000 (19:27 +0000)]
Merge pull request #15443 from anton-potapov:fluid_internal_parallellism_fix_review_comments
Maksim Shabunin [Mon, 9 Sep 2019 14:58:18 +0000 (14:58 +0000)]
Merge pull request #15485 from anton-potapov:gapi_standalone_fix_cmake_warning
Anton Potapov [Tue, 3 Sep 2019 12:03:51 +0000 (15:03 +0300)]
Fluid Internal Parallelism:
- add comments on signature of custom parallel_for
- use cv::parallel_for_ by default
Vitaly Tuzov [Mon, 26 Aug 2019 17:24:39 +0000 (20:24 +0300)]
Added performance test for StereoBM algorithm
Anton Potapov [Mon, 9 Sep 2019 13:23:04 +0000 (16:23 +0300)]
G-API: fixing CMake warning for standalone build
Sebastián Gurín [Fri, 6 Sep 2019 15:56:16 +0000 (12:56 -0300)]
js docker build docs emcc latest warning
Alexander Alekhin [Fri, 6 Sep 2019 15:57:52 +0000 (15:57 +0000)]
Merge pull request #15475 from alalek:build_eliminate_warning_array_bounds
Alexander Alekhin [Fri, 6 Sep 2019 15:33:01 +0000 (15:33 +0000)]
Merge pull request #15474 from alalek:gapi_test_valgrind_disable_memory_consuption_check
Alexander Alekhin [Fri, 6 Sep 2019 15:32:04 +0000 (15:32 +0000)]
Merge pull request #15461 from alalek:imgproc_connectedcomponents_allocation
Alexander Alekhin [Fri, 6 Sep 2019 14:48:24 +0000 (17:48 +0300)]
ts: eliminate -Warray-bounds warning
Alexander Alekhin [Fri, 6 Sep 2019 14:00:18 +0000 (17:00 +0300)]
gapi(test): disable memory consumption check in valgrind runs
Alexander Alekhin [Thu, 5 Sep 2019 20:52:46 +0000 (20:52 +0000)]
ffmpeg/3.4: update FFmpeg wrapper
Alexander Alekhin [Thu, 5 Sep 2019 12:41:11 +0000 (15:41 +0300)]
imgproc: avoid manual memory allocation in connectedcomponents.cpp
Alexander Alekhin [Thu, 5 Sep 2019 11:28:07 +0000 (14:28 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Jaime [Thu, 5 Sep 2019 10:55:17 +0000 (06:55 -0400)]
Merge pull request #14872 from AhiyaHiya:feature/topmost_window
* Added mechanism to set/toggle NORMAL window to TOPMOST window.
* highgui: remove unnecessary/legacy code
Alexander Alekhin [Thu, 5 Sep 2019 10:44:06 +0000 (10:44 +0000)]
Merge pull request #15170 from sturkmen72:update_samples
Suleyman TURKMEN [Sun, 28 Jul 2019 09:09:17 +0000 (12:09 +0300)]
Update Samples
Alexander Alekhin [Wed, 4 Sep 2019 16:25:34 +0000 (16:25 +0000)]
Merge pull request #15444 from alalek:ocl_fix_fft_kernel
Everton Constantino [Wed, 4 Sep 2019 16:14:00 +0000 (13:14 -0300)]
Merge pull request #15440 from everton1984:new_integral_tests
* Adding all possible data type interactions to the perf tests since some
use SIMD acceleration and others do not.
* Disabling full tests by default.
* Giving proper names, removing magic numbers and sanity checks of new
performance tests for the integral function.
* Giving proper names, making array static.
Alexander Alekhin [Wed, 4 Sep 2019 16:12:30 +0000 (16:12 +0000)]
Merge pull request #15451 from mattmyne:calibratecameraRO_fix_emptyJo
huihut [Wed, 4 Sep 2019 15:36:56 +0000 (23:36 +0800)]
Merge pull request #15433 from huihut:master
* fix 'chmod' is not recognized as an internal or external command in Windows
https://github.com/opencv/opencv/issues/14939
* cmake: update PCH command handling
Matt Bennett [Wed, 4 Sep 2019 14:33:03 +0000 (15:33 +0100)]
Prevent empty _Jo matrix multiplication when using calibrateCameraRO with iFixedPoint > 0
Maksim Shabunin [Wed, 4 Sep 2019 10:59:28 +0000 (13:59 +0300)]
cmake: add directory creation to download helper scripts
Maksim Shabunin [Wed, 4 Sep 2019 08:20:12 +0000 (11:20 +0300)]
cmake: download tries, customizable download parameters
Dmitry Kurtaev [Tue, 3 Sep 2019 15:58:57 +0000 (16:58 +0100)]
Merge pull request #15063 from dkurt:dnn_ie_ocv_layers
* Wrap unsupported by IE layers as custom layers
* Replace pointers to layers blobs to their shapes
* Enable Faster R-CNN with IE backend on CPU
Alexander Alekhin [Tue, 3 Sep 2019 12:46:53 +0000 (15:46 +0300)]
core(ocl): fix fft kernel compilation
- error: variables in the local address space can only be declared in the outermost scope of a kernel function
Alexander Alekhin [Tue, 3 Sep 2019 12:21:02 +0000 (12:21 +0000)]
Merge pull request #15437 from devnexen:fbsd_opencl_build_fix
Alexander Alekhin [Tue, 3 Sep 2019 12:05:57 +0000 (12:05 +0000)]
Merge pull request #15442 from alalek:fix_15293
Alexander Alekhin [Tue, 3 Sep 2019 12:05:16 +0000 (12:05 +0000)]
Merge pull request #15436 from alalek:update_version_4.1.2-pre
Alexander Alekhin [Tue, 3 Sep 2019 12:04:22 +0000 (12:04 +0000)]
Merge pull request #15435 from alalek:update_version_3.4.8-pre
Alexander Alekhin [Tue, 3 Sep 2019 11:00:28 +0000 (14:00 +0300)]
gapi(test): fix 32S->8U type in OwnMatConversion.WithND
Alexander Alekhin [Tue, 3 Sep 2019 10:50:45 +0000 (10:50 +0000)]
Merge pull request #15424 from mshabunin:add-cmake-docs
OrestChura [Tue, 3 Sep 2019 10:22:12 +0000 (13:22 +0300)]
Merge pull request #15419 from OrestChura:gapi_headers_internal_flag_issue
* - headers in "infer/" and "infer/ie/" folders are included into gapi_ext_hdrs;
+ because of that a few #includes are required in the headers
- HAVE_INF_ENGINE flag check in headers "infer/ie.hpp" and "infer/ie/util.hpp" is deleted
* - the "ie/util.hpp" header is a private header now as it's used for tests; it's been moved to the scr directory to the place next to the implementation file "ie/giebackend.cpp"
- the path to this header in files "ie/giebackend.cpp" and "test/infer/gapi_infer_ie_test.cpp" is updated
- As it's private header now and explicitly depends on IE, the "HAVE_INF_ENGINE" flag check is returned
David Carlier [Mon, 2 Sep 2019 13:39:31 +0000 (13:39 +0000)]
OpenCL: FreeBSD build fix
Alexander Alekhin [Mon, 2 Sep 2019 15:47:21 +0000 (15:47 +0000)]
Merge pull request #15438 from anton-potapov:fluid_internal_parallellism_fix_kw
Anton Potapov [Mon, 2 Sep 2019 13:16:01 +0000 (16:16 +0300)]
Fluid Internal Parallelism
- make static analysis happy
Alexey Smirnov [Mon, 2 Sep 2019 12:51:58 +0000 (15:51 +0300)]
Merge pull request #15312 from smirnov-alexey:gapi_fluid_garray
* Support GArray as input in fluid kernels
* Create tests on GArray input in fluid
* Some fixes to fully support GArray
* Refactor code and change the kernel according to review
* Add histogram calculation as a G-API kernel
Add assert that input GArgs in fluid contain at least one GMat
Alexander Alekhin [Mon, 2 Sep 2019 12:26:14 +0000 (15:26 +0300)]
pre: OpenCV 4.1.2 (version++)
Alexander Alekhin [Mon, 2 Sep 2019 11:25:18 +0000 (14:25 +0300)]
dnn: bump API version
Alexander Alekhin [Mon, 2 Sep 2019 11:20:49 +0000 (14:20 +0300)]
pre: OpenCV 3.4.8 (version++)
Alexander Alekhin [Mon, 2 Sep 2019 11:17:36 +0000 (14:17 +0300)]
experimental version++
Alexander Alekhin [Sun, 1 Sep 2019 21:57:57 +0000 (21:57 +0000)]
Merge pull request #15432 from atinfinity:removed-tegra-optimization
atinfinity [Sun, 1 Sep 2019 12:22:06 +0000 (21:22 +0900)]
removed tegra optimization
Alexander Alekhin [Sat, 31 Aug 2019 11:16:04 +0000 (11:16 +0000)]
Merge pull request #15339 from pmur:dotprod-32s-vsx
Alexander Alekhin [Sat, 31 Aug 2019 11:10:05 +0000 (11:10 +0000)]
Merge pull request #15402 from ChipKerchner:normUnroll
Chip Kerchner [Sat, 31 Aug 2019 10:47:58 +0000 (06:47 -0400)]
Merge pull request #15358 from ChipKerchner:imgwarpToHal
* Convert ImgWarp from SSE SIMD to HAL - 2.8x faster on Power (VSX) and 15% speedup on x86
* Change compile flag from CV_SIMD128 to CV_SIMD128_64F for use of v_float64x2 type
* Changing WarpPerspectiveLine from class functions and dispatching to static functions.
* Re-add dynamic runtime and dispatch execution.
* RRestore SSE4_1 optimizations inside opt_SSE4_1 namespace
Maksim Shabunin [Fri, 30 Aug 2019 22:47:04 +0000 (01:47 +0300)]
Assorted documentation fixes
* removed private flann documentation
* common tutorial images moved to doc/images
* grouping issues
Alexander Alekhin [Fri, 30 Aug 2019 13:22:42 +0000 (16:22 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 30 Aug 2019 12:03:19 +0000 (12:03 +0000)]
Merge pull request #15414 from kuzi117:instr
Alexander Alekhin [Thu, 29 Aug 2019 18:42:58 +0000 (18:42 +0000)]
Merge pull request #15418 from mshabunin:try-install-layout-34
Alexander Alekhin [Thu, 29 Aug 2019 18:40:19 +0000 (18:40 +0000)]
Merge pull request #15417 from alalek:ts_fix_callback_signature
Alexander Alekhin [Thu, 29 Aug 2019 18:39:00 +0000 (18:39 +0000)]
Merge pull request #15412 from kuzi117:ambig
Braedy Kuzma [Thu, 29 Aug 2019 00:20:09 +0000 (18:20 -0600)]
Use commonly supported instruction mnemonic.
Braedy Kuzma [Wed, 28 Aug 2019 23:39:08 +0000 (17:39 -0600)]
Disambiguate vecpopcnt for (u)dword2.
Maksim Shabunin [Thu, 29 Aug 2019 13:57:42 +0000 (16:57 +0300)]
Ported install layout refactoring from master branch
Alexander Alekhin [Thu, 29 Aug 2019 11:37:35 +0000 (14:37 +0300)]
ts: fix callback function signature
detected by UBSAN
Alexander Alekhin [Thu, 29 Aug 2019 08:26:31 +0000 (08:26 +0000)]
Merge pull request #15357 from ChipKerchner:fastCorner
Lubov Batanina [Thu, 29 Aug 2019 07:52:02 +0000 (10:52 +0300)]
Merge pull request #15395 from l-bat:fully_connected
* Fix IE FullyConnected layer
* Fix MyriadX
Alexander Alekhin [Wed, 28 Aug 2019 16:39:01 +0000 (16:39 +0000)]
Merge pull request #15407 from terfendail:test_check_any
Alexander Alekhin [Wed, 28 Aug 2019 15:58:21 +0000 (15:58 +0000)]
Merge pull request #14786 from mshabunin:try-install-layout
Chip Kerchner [Wed, 28 Aug 2019 15:56:48 +0000 (11:56 -0400)]
Merge pull request #15274 from ChipKerchner:lkpyramidToHal
* Convert lkpyramid from SSE SIMD to HAL - 90% faster on Power (VSX).
* Replace stores with reduce_sum. Rework to handle endianess correctly.
* Fix compiler warnings by casting values explicitly to shorts
* Switch to CV_SIMD128 compiler definition. Unroll loop to 8 elements since we've already loaded the data.
Vitaly Tuzov [Wed, 28 Aug 2019 11:53:31 +0000 (14:53 +0300)]
Extend tests for v_check_any and v_check_all intrinsics
Alexander Alekhin [Tue, 27 Aug 2019 19:59:39 +0000 (19:59 +0000)]
Merge pull request #15401 from ChipKerchner:vectorReduceInt8Bug