Alexander Alekhin [Tue, 9 Oct 2018 21:18:37 +0000 (21:18 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 9 Oct 2018 16:01:29 +0000 (19:01 +0300)]
Merge pull request #12636 from alalek:winpack_samples_cpp_build_script
* samples: add winpack "drap & drop" build script
* samples: add search for MSVS 2017 Enterprise
Hamdi Sahloul [Tue, 9 Oct 2018 14:39:39 +0000 (23:39 +0900)]
CUDA/BgSegm: fix the threshold of MOG2.Update test when detectShadow=true (#12762)
Apoorv Goel [Tue, 9 Oct 2018 12:49:17 +0000 (18:19 +0530)]
Merge pull request #12777 from UnderscoreAsterisk:document-cvtColorTwoPlane
* Add documentation for cvtColorTwoPlane
* Change brief and add links
Lubov Batanina [Mon, 8 Oct 2018 19:18:41 +0000 (22:18 +0300)]
Merge pull request #12596 from l-bat:l-bat/shufflenet_onnx
* Add Shufflenet support in ONNX
* Add test for transpose layer
Alexander Alekhin [Mon, 8 Oct 2018 19:15:54 +0000 (19:15 +0000)]
Merge pull request #12765 from cv3d:ts/cuda/device_name
Alexander Alekhin [Mon, 8 Oct 2018 15:34:30 +0000 (15:34 +0000)]
Merge pull request #12728 from alalek:calib3d_move_undistort
Alexander Alekhin [Mon, 8 Oct 2018 15:30:16 +0000 (15:30 +0000)]
Merge pull request #12755 from alalek:fix_allocSingleton
Alexander Alekhin [Mon, 8 Oct 2018 15:22:23 +0000 (15:22 +0000)]
Merge pull request #12754 from alalek:dnn_ocl4dnn_async_expressions
Alexander Alekhin [Mon, 8 Oct 2018 15:21:50 +0000 (15:21 +0000)]
Merge pull request #12752 from alalek:dnn_cleanup_getUMat
Alexander Alekhin [Mon, 8 Oct 2018 14:45:50 +0000 (17:45 +0300)]
Merge pull request #12725 from alalek:cmake_python_win32
* cmake: don't ignore Python from PATH environment variable
- this breaks selection between 32/64-bit Python
- this breaks Anaconda/Conda environments
- it is not the CMake default behavior, expected by many projects
* cmake: add Python version check, fallback path on CMake 3.12+
* cmake: drop Python 2.6, allow version selection for Python 3.x
Alexander Alekhin [Mon, 8 Oct 2018 14:36:32 +0000 (14:36 +0000)]
Merge pull request #12767 from dkurt:fix_js_features2d
Dmitry Kurtaev [Sun, 7 Oct 2018 19:55:38 +0000 (22:55 +0300)]
Fix JavaScript bindings for features2d module
Hamdi Sahloul [Sun, 7 Oct 2018 17:51:45 +0000 (02:51 +0900)]
TS/CUDA: Show device ID in case of multiple devices
Alexander Alekhin [Fri, 5 Oct 2018 16:03:34 +0000 (16:03 +0000)]
Merge pull request #12753 from mshabunin:fix-ffmpeg-dl
Alexander Alekhin [Fri, 5 Oct 2018 15:23:05 +0000 (18:23 +0300)]
core: update allocSingleton implementation, valgrind suppression
Maksim Shabunin [Fri, 5 Oct 2018 13:38:44 +0000 (16:38 +0300)]
FFmpeg: correct licenses install location
Alexander Alekhin [Fri, 5 Oct 2018 14:06:50 +0000 (17:06 +0300)]
dnn: don't use Mat expressions with async UMat functions
Alexander Alekhin [Fri, 5 Oct 2018 12:10:58 +0000 (15:10 +0300)]
dnn(ocl4dnn): don't use getUMat()
especially in CPU only processing
Alexander Alekhin [Fri, 5 Oct 2018 10:20:12 +0000 (10:20 +0000)]
Merge pull request #12744 from alalek:issue_12736
Alexander Alekhin [Fri, 5 Oct 2018 09:28:07 +0000 (09:28 +0000)]
Merge pull request #12749 from powderluv:fix-clang-cl-tzcnt
Alexander Alekhin [Tue, 2 Oct 2018 21:51:29 +0000 (21:51 +0000)]
calib3d: move undistort files from imgproc
Anush Elangovan [Thu, 4 Oct 2018 17:48:14 +0000 (10:48 -0700)]
_tzcnt_u32() is undefined in clang-cl so use alternate impl
_tzcnt_u32() is not exported by clang-cl intrin.h so check for
clang-cl and enable an alterate for _tzcnt_u32()
Some discussions:
http://lists.llvm.org/pipermail/cfe-dev/2016-October/051329.html
https://bugs.llvm.org/show_bug.cgi?id=30506
TEST=Build with clang-cl
Alexander Alekhin [Thu, 4 Oct 2018 16:42:16 +0000 (16:42 +0000)]
Merge pull request #12745 from savuor:fix/ocl_arg_local_size
Rostislav Vasilikhin [Thu, 4 Oct 2018 11:26:32 +0000 (14:26 +0300)]
ocl::KernelArg::Local(): added size argument
Alexander Alekhin [Thu, 4 Oct 2018 14:17:22 +0000 (14:17 +0000)]
Merge pull request #12741 from GeorgeMironov:fix-cmake-protobuf
Alexander Alekhin [Thu, 4 Oct 2018 12:53:37 +0000 (12:53 +0000)]
Merge pull request #12695 from sam09:master
Alexander Alekhin [Thu, 4 Oct 2018 11:43:43 +0000 (14:43 +0300)]
cmake: define CV_ErrorNoReturn under CV_STATIC_ANALYSIS
to avoid build break without `__OPENCV_BUILD`
Alexander Alekhin [Thu, 4 Oct 2018 11:33:34 +0000 (11:33 +0000)]
Merge pull request #12735 from tomoaki0705:fixCudaStereoTestFailure
Alexander Alekhin [Thu, 4 Oct 2018 11:31:47 +0000 (11:31 +0000)]
Merge pull request #12726 from alalek:dnn_ocl_conv_avoid_multiple_expr_evaluation
Georgy Mironov [Thu, 4 Oct 2018 10:48:40 +0000 (13:48 +0300)]
Fix install with external protobuf
Tomoaki Teshima [Wed, 3 Oct 2018 23:35:34 +0000 (08:35 +0900)]
fix test failure of StereoBeliefPropagation
* if the src has odd number of height, access error happens
* it could happen on width, too
* check both dst and src range in both width and height
Apoorv Goel [Wed, 3 Oct 2018 12:50:04 +0000 (18:20 +0530)]
Merge pull request #12731 from UnderscoreAsterisk:fix-12012
* fix #12012
* Replace CV_StsBadFlag with Error::StsBadFlag
Sam Radhakrishnan [Sat, 29 Sep 2018 19:06:20 +0000 (00:36 +0530)]
Fixes #12692: Update samples/gpu/videoreader.cpp
Change iteration to iterate separately when the video is decode on a GPU to account for different number of frames
Alexander Alekhin [Wed, 3 Oct 2018 07:21:06 +0000 (07:21 +0000)]
Merge pull request #12727 from rnk:fix-clang-cl-cmake
Alexander Alekhin [Wed, 3 Oct 2018 06:14:43 +0000 (06:14 +0000)]
Merge pull request #12693 from peters:patch-1
Reid Kleckner [Tue, 2 Oct 2018 21:30:52 +0000 (14:30 -0700)]
Fix CMake for clang-cl
Avoids passing -Wall, which will enable literally every warning in
Clang. Avoids passing -ffunction-sections etc to clang-cl, which each
generate warnings.
Alexander Alekhin [Tue, 2 Oct 2018 21:10:52 +0000 (21:10 +0000)]
dnn(ocl4dnn): calculate activation expression once
- to avoid multiple conditional calls via sub_group() functions
Alexander Alekhin [Tue, 2 Oct 2018 20:52:34 +0000 (20:52 +0000)]
Merge pull request #12722 from tomoaki0705:fixCudaFiltersFailure
Peter Rekdal Sunde [Sat, 29 Sep 2018 17:43:01 +0000 (19:43 +0200)]
Obtain fourcc when `AVStream` is network stream
The `codec_tag` is only available when opening a file from disk. If `AVStream` is a network stream then `fourcc` must be obtained using `codec_id`. I have tested the following scenarios:
1) Open a `.mp4` file and verify that `codec_tag` is returned (old behavior)
2) Open a `rtsp` stream and verify that `codec_fourcc` is returned (Tested with a MJPEG, H264 and H265 stream)
Alexander Alekhin [Tue, 2 Oct 2018 16:40:13 +0000 (16:40 +0000)]
Merge pull request #12605 from terfendail:integral_wintr
Alexander Alekhin [Tue, 2 Oct 2018 16:39:50 +0000 (16:39 +0000)]
Merge pull request #12581 from terfendail:lapack_intr
Tomoaki Teshima [Tue, 2 Oct 2018 15:59:08 +0000 (00:59 +0900)]
fix test failure of cudafilters Median_Accuracy
* avoid race condition
Alexander Alekhin [Tue, 2 Oct 2018 03:21:47 +0000 (03:21 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Vitaly Tuzov [Tue, 18 Sep 2018 09:22:34 +0000 (12:22 +0300)]
SSE2 code in invert() replaced with universal intrinsics
Suleyman TURKMEN [Mon, 1 Oct 2018 19:22:37 +0000 (22:22 +0300)]
Merge pull request #12649 from sturkmen72:patch-9
Update hog.cpp (#12649)
Alexander Alekhin [Mon, 1 Oct 2018 15:57:57 +0000 (15:57 +0000)]
Merge pull request #12669 from mshabunin:add-paths-config
Alexander Alekhin [Mon, 1 Oct 2018 15:57:31 +0000 (15:57 +0000)]
Merge pull request #12620 from alalek:ocl_extra_build_options
Alexander Alekhin [Mon, 1 Oct 2018 15:36:49 +0000 (15:36 +0000)]
Merge pull request #12711 from alalek:dnn_ocl_idlf_drop_weights_buf
Alexander Alekhin [Fri, 21 Sep 2018 15:04:18 +0000 (15:04 +0000)]
ocl: OPENCV_OPENCL_BUILD_EXTRA_OPTIONS parameter
Maksim Shabunin [Thu, 27 Sep 2018 12:52:42 +0000 (15:52 +0300)]
Added support for multi-path configuration parameter (env)
Vitaly Tuzov [Fri, 21 Sep 2018 13:21:40 +0000 (16:21 +0300)]
integral() implementation updated to utilize wide universal intrinsics
Alexander Alekhin [Mon, 1 Oct 2018 13:35:03 +0000 (13:35 +0000)]
Merge pull request #12714 from antonioborondo:fix_documentation_cuda_compare
Alexander Alekhin [Mon, 1 Oct 2018 13:32:51 +0000 (13:32 +0000)]
Merge pull request #12709 from WydD:3.4
Alexander Alekhin [Mon, 1 Oct 2018 13:32:29 +0000 (13:32 +0000)]
Merge pull request #12708 from ldevulder:protobuf-fix-compilation-issue-on-s390
Antonio Borondo [Mon, 1 Oct 2018 12:23:13 +0000 (13:23 +0100)]
Fix documentation of cv::cuda::compare
Alexander Alekhin [Sun, 30 Sep 2018 21:00:01 +0000 (00:00 +0300)]
Merge pull request #12668 from alalek:calib3d_chessboardsb_updates
Alexander Alekhin [Sun, 30 Sep 2018 20:59:48 +0000 (23:59 +0300)]
Merge pull request #12705 from berak:imread_document_grayscale
Alexander Alekhin [Sun, 30 Sep 2018 20:22:39 +0000 (20:22 +0000)]
dnn(ocl4dnn): drop weights_buf
- avoid memory access violation during "prefetch" stage
Loic Petit [Sun, 30 Sep 2018 20:24:02 +0000 (22:24 +0200)]
Fix frame rate rounding in ffmpeg wrapper (#9023)
Loic Devulder [Fri, 28 Sep 2018 13:33:18 +0000 (15:33 +0200)]
3rdparty/protobuf: fix compilation issue on s390
This commit fixes an issue while trying to compile
on s390x architecture.
This is simply a backport of a fixe already applied
in official protobuf code:
- https://github.com/protocolbuffers/protobuf/pull/3955
berak [Sun, 30 Sep 2018 13:22:26 +0000 (15:22 +0200)]
document imread grayscale behaviour
Hamdi Sahloul [Sat, 29 Sep 2018 17:03:54 +0000 (02:03 +0900)]
Merge pull request #12667 from cv3d:fix/ts_report
TS: fix Python v2/v3 compatibility (#12667)
* TS: fix Python2.7 compatibility
* TS: fix Python3 compatibility
* py3: use integer division '/' => '//' instead of cast
Alexander Alekhin [Sat, 29 Sep 2018 16:39:04 +0000 (16:39 +0000)]
Merge pull request #12690 from cv3d:fix/ts_python_exe
Alexander Alekhin [Sat, 29 Sep 2018 16:36:25 +0000 (16:36 +0000)]
Merge pull request #12666 from tomoaki0705:cudevTestFailureLuvRGB
Hamdi Sahloul [Sat, 29 Sep 2018 10:34:44 +0000 (19:34 +0900)]
Utilize the currently running Python executable
especially if it matches the module being tested
Tomoaki Teshima [Sat, 29 Sep 2018 14:13:12 +0000 (23:13 +0900)]
fix test failure of cudev
* follow the implementation of Luv2RGBfloat in imgproc/src/color_lab.cpp
* loosen threshold in cudaimgproc
Alexander Alekhin [Sat, 29 Sep 2018 13:03:38 +0000 (16:03 +0300)]
Merge pull request #12682 from soonbro:patch-1
Alexander Alekhin [Sat, 29 Sep 2018 13:02:33 +0000 (16:02 +0300)]
Merge pull request #12676 from PWhiddy:patch-1
Alexander Alekhin [Sat, 29 Sep 2018 12:52:27 +0000 (12:52 +0000)]
Merge pull request #12663 from sturkmen72:patch-12
Alexander Alekhin [Sat, 29 Sep 2018 12:50:51 +0000 (12:50 +0000)]
Merge pull request #12661 from Slyce-Inc:fix-xcode10-bitcode
Alexander Alekhin [Sat, 29 Sep 2018 12:45:47 +0000 (12:45 +0000)]
Merge pull request #12576 from cv3d:fix/cuda/polar_to_cart
soonbro [Fri, 28 Sep 2018 10:13:39 +0000 (19:13 +0900)]
fix typo in FpsMeter.java
'mFramesCouner' -> 'mFramesCounter'
Alexander Alekhin [Fri, 28 Sep 2018 19:21:04 +0000 (19:21 +0000)]
Merge pull request #12653 from cv3d:cuda/legacy_traits
Hamdi Sahloul [Thu, 27 Sep 2018 23:58:30 +0000 (08:58 +0900)]
Fix Python wrapper for GpuMat
Alexander Alekhin [Sun, 2 Sep 2018 03:31:05 +0000 (03:31 +0000)]
CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement
chacha21 [Fri, 28 Sep 2018 16:19:05 +0000 (18:19 +0200)]
Merge pull request #12658 from chacha21:clr-mutex
* hide use of std::mutex from /clr compilation under Visual Studio
C++11 <mutex> is not available when compiling with /clr under Visual Studio, thus opencv cannot be easily included.
It is fixed by making a CEEMutex wrapper class, around an opaque implementation using std::mutex internally
* fixed compilation outside of Visual Studio
fixed compilation outside of Visual Studio by avoiding some macros
* fixed indentation, prepare getting rid of CEEMutex/CEELockGuard
fixed indentation
After discussion, CEEMutex and CEELockGuard can be totally removed, letting the developer in a /clr context to provide his own implementation
* remove CEEMutex/CEELockGuard
Alexander Alekhin [Fri, 28 Sep 2018 16:18:09 +0000 (16:18 +0000)]
Merge pull request #12659 from dkurt:js_features2d
Alexander Alekhin [Fri, 28 Sep 2018 16:15:19 +0000 (16:15 +0000)]
Merge pull request #12630 from alalek:docs_blacklist_matlab
Alexander Alekhin [Fri, 28 Sep 2018 16:07:21 +0000 (16:07 +0000)]
Merge pull request #12678 from cv3d:cleanup/python/enums
Suleyman TURKMEN [Thu, 27 Sep 2018 04:42:21 +0000 (07:42 +0300)]
Update findContours parameter type
Dmitry Matveev [Fri, 28 Sep 2018 15:42:09 +0000 (18:42 +0300)]
Merge pull request #12674 from dmatveev:gapi_upd270918
* Update G-API code base to 27-Sep-18
Changes mostly improve standalone build support
* G-API code base update 28-09-2018
* Windows/Documentation warnings should be fixed
* Fixed stability issues in Fluid backend
* Fixed precompiled headers issues in G-API source files
* G-API code base update 28-09-18 EOD
* Fixed several static analysis issues
* Fixed issues found when G-API is built in a standalone mode
Alexander Alekhin [Fri, 28 Sep 2018 14:16:25 +0000 (14:16 +0000)]
Merge pull request #12656 from alalek:fix_documentation_build
Andrew Mroczkowski [Wed, 26 Sep 2018 21:20:37 +0000 (17:20 -0400)]
Fix Xcode version parsing error (affects bitcode generation)
The regex was only parsing for a single digit in the major version, causing Xcode 10 to be treated as version "1". Other parts of the script only turn on bitcode generation if the Xcode version is > 7.
Alexander Alekhin [Fri, 28 Sep 2018 13:53:05 +0000 (16:53 +0300)]
Merge pull request #12673 from alalek:fix_build_warnings
* fix build warnings
* python: forbid wrapping of functions with "void*" arguments
Alexander Alekhin [Fri, 28 Sep 2018 09:48:51 +0000 (12:48 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 28 Sep 2018 09:45:49 +0000 (09:45 +0000)]
Merge pull request #12657 from alalek:docs_repair_cuda_section
Dmitry Kurtaev [Wed, 26 Sep 2018 16:11:40 +0000 (19:11 +0300)]
JavaScript bindings for features2d module
Hamdi Sahloul [Fri, 28 Sep 2018 06:39:51 +0000 (15:39 +0900)]
Generate enum bindings automatically
Peter Whidden [Thu, 27 Sep 2018 21:37:59 +0000 (14:37 -0700)]
Fix typo "wit" -> "with"
Alexander Alekhin [Thu, 27 Sep 2018 19:46:59 +0000 (19:46 +0000)]
Merge pull request #12660 from alalek:flann_drop_useless_mutex
Rostislav Vasilikhin [Thu, 27 Sep 2018 19:39:06 +0000 (22:39 +0300)]
Merge pull request #12637 from savuor:fix/instr_ipp_ocl
Fixes for instrumentation of IPP and OCL (#12637)
* fixed warning about re-declaring variable when both IPP and instrumentation are enabled
* fixed segfault when no funName provided
* compilation fixed when both OCL and instrumentation are enabled
Alexander Alekhin [Thu, 27 Sep 2018 16:23:05 +0000 (16:23 +0000)]
Merge pull request #12671 from alalek:fix_build_warnings_3.4
Alexander Alekhin [Thu, 27 Sep 2018 13:42:44 +0000 (13:42 +0000)]
Merge pull request #12568 from sturkmen72:patch-3
Alexander Alekhin [Thu, 27 Sep 2018 13:31:31 +0000 (16:31 +0300)]
fix build warnings
Alexander Alekhin [Thu, 27 Sep 2018 12:01:51 +0000 (15:01 +0300)]
calib3d: findChessboardCornersSB() minor updates
- avoid updating of input image during equalizeHist() call
- avoid for() with double variable (use 'int' instead)
- more CV_Check*() macros
- use Mat_<T>, Matx
- static for local variables
Alexander Alekhin [Thu, 27 Sep 2018 09:54:23 +0000 (12:54 +0300)]
Merge pull request #12650 from alalek:dnn_ocl4dnn_verification_test
* dnn(ocl4dnn): update kernel checks
* dnn: workaround for IDLF kernels on Intel iGPU
* dnn(test): remove "skip" check for unstable cases
Dmitry Matveev [Wed, 26 Sep 2018 18:50:39 +0000 (21:50 +0300)]
Merge pull request #12608 from dmatveev:gapi
* G-API Initial code upload
* Update G-API code base to Sep-24-2018
* The majority of OpenCV buildbot problems was addressed
* Update G-API code base to 24-Sep-18 EOD
* G-API code base update 25-Sep-2018
* Linux warnings should be resolved
* Documentation build should become green
* Number of Windows warnings should be reduced
* Update G-API code base to 25-Sep-18 EOD
* ARMv7 build issue should be resolved
* ADE is bumped to latest version and should fix Clang builds for macOS/iOS
* Remaining Windows warnings should be resolved
* New Linux32 / ARMv7 warnings should be resolved
* G-API code base update 25-Sep-2018-EOD2
* Final Windows warnings should be resolved now
* G-API code base update 26-Sep-2018
* Fixed issues with precompiled headers in module and its tests
Alexander Alekhin [Wed, 26 Sep 2018 16:37:44 +0000 (19:37 +0300)]
flann: drop useless mutex
Alexander Alekhin [Wed, 26 Sep 2018 16:21:07 +0000 (16:21 +0000)]
Merge pull request #12655 from alalek:fix_printf_format_warning