Alexander Alekhin
0f3fe957f5
Merge pull request #12450 from sturkmen72:update_HOGDescriptor
2018-10-11 19:23:35 +00:00
Alexander Alekhin
fc4679d4cf
Merge pull request #12795 from mshabunin:fix-win-python
2018-10-10 20:55:32 +00:00
Alexander Alekhin
35c53204cb
Merge pull request #12781 from alalek:videoio_drop_rectification_dc1394
2018-10-10 20:01:06 +00:00
Alexander Alekhin
f731515628
cmake: fix Python detection for standalone bindings
2018-10-10 22:59:42 +03:00
Suleyman TURKMEN
abbb73e894
Update HOGDescriptor
2018-10-10 21:53:35 +03:00
Alexander Alekhin
dada5a422d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-09 21:20:15 +00:00
Alexander Alekhin
421fdc0e94
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
2018-10-09 19:01:29 +03:00
Hamdi Sahloul
c4d434fd6f
CUDA/BgSegm: fix the threshold of MOG2.Update test when detectShadow=true ( #12762 )
2018-10-09 17:39:39 +03:00
Alexander Alekhin
8bb3d363a4
videoio: drop rectification code for VIDERE cameras
2018-10-09 14:06:15 +00:00
Apoorv Goel
b8aa0cddab
Merge pull request #12777 from UnderscoreAsterisk:document-cvtColorTwoPlane
...
* Add documentation for cvtColorTwoPlane
* Change brief and add links
2018-10-09 15:49:17 +03:00
Lubov Batanina
50811e04f2
Merge pull request #12596 from l-bat:l-bat/shufflenet_onnx
...
* Add Shufflenet support in ONNX
* Add test for transpose layer
2018-10-08 22:18:41 +03:00
Alexander Alekhin
449826288b
Merge pull request #12765 from cv3d:ts/cuda/device_name
2018-10-08 19:15:54 +00:00
Alexander Alekhin
1522722fab
Merge pull request #12728 from alalek:calib3d_move_undistort
2018-10-08 15:34:30 +00:00
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
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
Alexander Alekhin
8f1f4273a2
calib3d: move undistort files from imgproc
2018-10-05 07:52:21 +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
a9c8a526cf
Merge pull request #12695 from sam09:master
2018-10-04 12:53:37 +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
Sam Radhakrishnan
699db77293
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
2018-10-03 17:42:57 +05:30
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
Alexander Alekhin
690fb0544c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-02 14:31:05 +03:00