Alexander Alekhin
68fe37b008
Merge pull request #12755 from alalek:fix_allocSingleton
2018-10-08 15:30:17 +00:00
Alexander Alekhin
26ba4f3c1d
Merge pull request #12754 from alalek:dnn_ocl4dnn_async_expressions
2018-10-08 15:22:24 +00:00
Alexander Alekhin
e19b422854
Merge pull request #12752 from alalek:dnn_cleanup_getUMat
2018-10-08 15:21:50 +00:00
Alexander Alekhin
913c4151bf
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
2018-10-08 17:45:50 +03:00
Alexander Alekhin
78a802baae
Merge pull request #12767 from dkurt:fix_js_features2d
2018-10-08 14:36:32 +00:00
Vitaly Tuzov
9d602f2752
Replaced SSE2 area resize implementation with wide universal intrinsic implementation
2018-10-08 16:27:52 +03:00
Dmitry Kurtaev
7649e537b7
Fix JavaScript bindings for features2d module
2018-10-07 22:55:38 +03:00
Hamdi Sahloul
2faa4cd933
TS/CUDA: Show device ID in case of multiple devices
2018-10-08 03:00:25 +09:00
Alexander Alekhin
0492301e76
Merge pull request #12753 from mshabunin:fix-ffmpeg-dl
2018-10-05 16:03:34 +00:00
Alexander Alekhin
18bf91a08b
core: update allocSingleton implementation, valgrind suppression
2018-10-05 18:25:13 +03:00
Maksim Shabunin
09ef4c9cff
FFmpeg: correct licenses install location
2018-10-05 17:10:42 +03:00
Alexander Alekhin
634dd656d5
dnn: don't use Mat expressions with async UMat functions
2018-10-05 17:09:50 +03:00
Alexander Alekhin
9d02d42afe
dnn(ocl4dnn): don't use getUMat()
...
especially in CPU only processing
2018-10-05 15:24:51 +03:00
Alexander Alekhin
c716e374c1
Merge pull request #12744 from alalek:issue_12736
2018-10-05 10:20:13 +00:00
Alexander Alekhin
aeec6e43eb
Merge pull request #12749 from powderluv:fix-clang-cl-tzcnt
2018-10-05 09:28:07 +00:00
Anush Elangovan
630a94b8b7
_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
2018-10-04 14:04:22 -07:00
Alexander Alekhin
ceca139f7f
Merge pull request #12745 from savuor:fix/ocl_arg_local_size
2018-10-04 16:42:16 +00:00
Rostislav Vasilikhin
da5e0ef461
ocl::KernelArg::Local(): added size argument
2018-10-04 17:19:09 +03:00
Alexander Alekhin
4fa6734320
Merge pull request #12741 from GeorgeMironov:fix-cmake-protobuf
2018-10-04 14:17:22 +00:00
Alexander Alekhin
0926a84a45
cmake: define CV_ErrorNoReturn under CV_STATIC_ANALYSIS
...
to avoid build break without `__OPENCV_BUILD`
2018-10-04 14:43:43 +03:00
Alexander Alekhin
0101fa789c
Merge pull request #12735 from tomoaki0705:fixCudaStereoTestFailure
2018-10-04 11:33:34 +00:00
Alexander Alekhin
12b3d157a5
Merge pull request #12726 from alalek:dnn_ocl_conv_avoid_multiple_expr_evaluation
2018-10-04 11:31:47 +00:00
Georgy Mironov
60c26f8f1e
Fix install with external protobuf
2018-10-04 13:48:59 +03:00
Tomoaki Teshima
7294ae0f17
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
2018-10-04 08:35:34 +09:00
Apoorv Goel
0ffc186680
Merge pull request #12731 from UnderscoreAsterisk:fix-12012
...
* fix #12012
* Replace CV_StsBadFlag with Error::StsBadFlag
2018-10-03 15:50:04 +03:00
Alexander Alekhin
50beef605b
Merge pull request #12727 from rnk:fix-clang-cl-cmake
2018-10-03 07:21:06 +00:00
Alexander Alekhin
068ebe8b4d
Merge pull request #12693 from peters:patch-1
2018-10-03 06:14:44 +00:00
Reid Kleckner
ffaf58349c
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.
2018-10-02 14:55:26 -07:00
Alexander Alekhin
eec468fa13
dnn(ocl4dnn): calculate activation expression once
...
- to avoid multiple conditional calls via sub_group() functions
2018-10-02 21:23:41 +00:00
Alexander Alekhin
81c94357e8
Merge pull request #12722 from tomoaki0705:fixCudaFiltersFailure
2018-10-02 20:52:34 +00:00
Peter Rekdal Sunde
042c486b68
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)
2018-10-02 22:15:05 +02:00
Alexander Alekhin
6921f967a1
Merge pull request #12605 from terfendail:integral_wintr
2018-10-02 16:40:13 +00:00
Alexander Alekhin
83a0c12144
Merge pull request #12581 from terfendail:lapack_intr
2018-10-02 16:39:50 +00:00
Tomoaki Teshima
fa8684b5c8
fix test failure of cudafilters Median_Accuracy
...
* avoid race condition
2018-10-03 00:59:08 +09:00
Vitaly Tuzov
283348afc3
SSE2 code in invert() replaced with universal intrinsics
2018-10-02 12:47:07 +03:00
Suleyman TURKMEN
ee0c985491
Merge pull request #12649 from sturkmen72:patch-9
...
Update hog.cpp (#12649 )
2018-10-01 22:22:37 +03:00
Alexander Alekhin
b41f38ecc7
Merge pull request #12669 from mshabunin:add-paths-config
2018-10-01 15:57:57 +00:00
Alexander Alekhin
682180e0cd
Merge pull request #12620 from alalek:ocl_extra_build_options
2018-10-01 15:57:31 +00:00
Alexander Alekhin
1385db48f5
Merge pull request #12711 from alalek:dnn_ocl_idlf_drop_weights_buf
2018-10-01 15:36:49 +00:00
Alexander Alekhin
94201b7cf9
ocl: OPENCV_OPENCL_BUILD_EXTRA_OPTIONS parameter
2018-10-01 17:56:17 +03:00
Maksim Shabunin
15632c6305
Added support for multi-path configuration parameter (env)
2018-10-01 17:50:47 +03:00
Vitaly Tuzov
6b84990620
integral() implementation updated to utilize wide universal intrinsics
2018-10-01 17:25:43 +03:00
Alexander Alekhin
c9b6b2cf04
Merge pull request #12714 from antonioborondo:fix_documentation_cuda_compare
2018-10-01 13:35:03 +00:00
Alexander Alekhin
617fe2545c
Merge pull request #12709 from WydD:3.4
2018-10-01 13:32:51 +00:00
Alexander Alekhin
93663dc57a
Merge pull request #12708 from ldevulder:protobuf-fix-compilation-issue-on-s390
2018-10-01 13:32:29 +00:00
Antonio Borondo
28e55dc5f3
Fix documentation of cv::cuda::compare
2018-10-01 13:23:18 +01:00
Alexander Alekhin
9253e8bda2
Merge pull request #12705 from berak:imread_document_grayscale
2018-09-30 23:59:48 +03:00
Alexander Alekhin
0f031b6680
dnn(ocl4dnn): drop weights_buf
...
- avoid memory access violation during "prefetch" stage
2018-09-30 20:35:41 +00:00
Loic Petit
255b20f6de
Fix frame rate rounding in ffmpeg wrapper ( #9023 )
2018-09-30 22:24:02 +02:00
Loic Devulder
ac9ec55b37
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
2018-09-30 21:33:34 +02:00