Alexander Alekhin
ccd32f6608
Merge pull request #7897 from alalek:fix_ffmpeg_check
...
cmake: fix ffmpeg check code (port into master #7893 )
2016-12-19 16:18:49 +02:00
Alexander Alekhin
d85c11e525
OpenCV version++
...
3.2.0-rc
2016-12-19 17:12:18 +03:00
Alexander Alekhin
3e1695d6e3
cmake: fix ffmpeg check code
2016-12-19 17:05:30 +03:00
Alexander Alekhin
2638abe12b
Merge pull request #7694 from sergiud:cmake-config-optional-components
2016-12-19 13:53:36 +00:00
Alexander Alekhin
86bb523991
Merge pull request #7871 from savuor:fix/openvx_cvt_on
2016-12-19 13:51:53 +00:00
Alexander Alekhin
5a07e102fa
Merge pull request #7896 from alalek:fix_add_testdata
2016-12-19 13:49:23 +00:00
Vadim Pisarevsky
ae9f80c1a9
Merge pull request #7855 from logic1988:master
2016-12-19 13:45:51 +00:00
Alexander Alekhin
35308bc45f
cmake: fix CMake error
...
"install DIRECTORY does not allow "COMPONENT" after PATTERN or REGEX."
2016-12-19 14:58:56 +03:00
Alexander Alekhin
07004a46ca
Merge pull request #7773 from savuor:openvx_harris
2016-12-19 11:39:38 +00:00
Sergiu Deitsch
d71ec0cd1d
cmake: support OPTIONAL_COMPONENTS in OpenCVConfig.cmake
...
find_package allows to specify optional components. This way, the
command will not fail if any of the components marked as optional was
not found. This is useful in cases where components such as xfeatures2d,
viz etc. are not available either because they were not compiled by the
user or package maintainers decided to not provide the packages at all.
The user can check the availability of the optional component using the
OpenCV_<component>_FOUND variable.
2016-12-19 00:15:51 +03:00
Alexander Alekhin
85e01f3ffe
Merge pull request #7884 from jacobdang:bugfix_7846
2016-12-17 18:31:58 +00:00
jacobdang
dd482c6a29
bug fix for #7846
2016-12-17 21:48:29 +08:00
Alexander Alekhin
9e57d1ae34
Merge pull request #7881 from alalek:unpack_into_binary
2016-12-17 12:23:02 +00:00
Alexander Alekhin
6a537e3986
Merge pull request #7882 from savuor:fix/ovx_pyrlk_err
2016-12-17 07:33:33 +00:00
Rostislav Vasilikhin
328151c8a4
don't run OpenVX pyrLK if user asked for err vector
2016-12-16 23:38:47 +03:00
Rostislav Vasilikhin
fcdbe16252
openvx_cvt disabled for Khronos, fixed sstep and dstep usage
2016-12-16 23:00:55 +03:00
logic1988
de059567d7
Update inner_functions.cpp
...
Fix #4958 cv::ml::StatModel::calcError not working for responses of type CV_32S
2016-12-16 20:01:07 +03:00
Alexander Alekhin
ef08110182
Merge pull request #7880 from sovrasov:rtrees_disable_kfold
2016-12-16 16:46:57 +00:00
Alexander Alekhin
862c3aa6e1
Merge pull request #7873 from addisonElliott:Mat_Range_InitializerList
2016-12-16 16:45:17 +00:00
Alexander Alekhin
c9237a6f48
cmake: unpack IPPICV into binary directory
2016-12-16 18:43:54 +03:00
Rostislav Vasilikhin
13b9dd3963
fixed segfault at ORB::compute() near image's border
2016-12-16 18:36:37 +03:00
Alexander Alekhin
0a4694d6e0
Merge branch '2.4' into master
2016-12-16 17:04:32 +03:00
Alexander Alekhin
0e4dde1781
Merge pull request #7872 from alalek:merge-2.4
2016-12-16 16:03:14 +02:00
Vladislav Sovrasov
d2e5bea1fb
Disable training of RTrees when CVFolds > 0
2016-12-16 16:39:44 +03:00
Alexander Alekhin
c7ae26bf24
Merge pull request #7879 from alalek:backport_7852
2016-12-16 13:19:58 +00:00
Alexander Alekhin
a206e12174
Merge pull request #7876 from mshabunin:fix-sgbm-memory
2016-12-16 13:09:04 +00:00
Rostislav Vasilikhin
cf5e976fad
OpenVX convert enabled
2016-12-16 15:57:21 +03:00
Rostislav Vasilikhin
a2646062b2
ivx::Scalars replaced by immediate values
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
1e2ad7e3e3
rewritten for new macro use
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
ee77538cf9
disabled due to bad accuracy
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
3f1734bbc7
fixed type checks in wrappers; array downloading code simplified
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
77f99358df
fix vxCommitArrayRange() call
2016-12-16 15:44:31 +03:00
Rostislav Vasilikhin
5f4112a1cf
added initial version of wrapper for Harris corner detection
2016-12-16 15:44:31 +03:00
Vadim Pisarevsky
75eeb25c1e
Merge pull request #7866 from alalek:update_waitKey
2016-12-16 12:25:11 +00:00
Rostislav Vasilikhin
8444c23803
fixed segfault at ORB::compute() near image's border
2016-12-16 14:55:15 +03:00
Rostislav Vasilikhin
969c55da58
Merge pull request #7720 from savuor:openvx_FAST
...
Added OpenVX based processing to FAST (#7720 )
* added wrapper for OVX FAST & fixes to IVX wrappers
* fixed type checks in wrappers, array downloading code simplified
* rewritten for new macro use
2016-12-16 13:48:18 +02:00
Alexander Alekhin
c038d1be60
Merge pull request #7858 from addisonElliott:master
2016-12-16 10:57:27 +00:00
Rostislav Vasilikhin
faefbf93bc
Merge pull request #7793 from savuor:openvx_pyrDown
...
OpenVX pyrDown wrappers (#7793 )
* wrappers for vx_pyramid added
* initial version of pyrDown() wrapper added
* disabled for Khronos
* rewritten for new macro use; border mode added to node
2016-12-16 12:48:58 +02:00
Rostislav Vasilikhin
5372c8b331
Merge pull request #7774 from savuor:openvx_pyrlk
...
OpenVX optical flow PyrLK wrappers added (#7774 )
* wrappers for vx_pyramid added
* initial version of Optical Flow PyrLK wrappers added
* array downloading code simplified
* disabled due to bad accuracy; fixed bugs, e.g. vendor-specific ones
* rewritten for new macro use
2016-12-16 12:46:03 +02:00
Alexander Alekhin
9c7088d95f
Merge pull request #7851 from terfendail:ovx_imagespace
2016-12-16 10:37:04 +00:00
Alexander Alekhin
a615d79f2d
Merge pull request #7768 from terfendail:ovx_remap
2016-12-16 10:33:58 +00:00
Alexander Alekhin
f7d956ea3e
Merge pull request #7869 from alalek:icc
...
Build with ICC
2016-12-15 19:21:18 +02:00
Alexander Alekhin
22df206e1f
Merge pull request #7875 from alalek:winpack_fix_2.4
...
cmake: update PDB support condition
2016-12-15 18:47:41 +02:00
Alexander Alekhin
b06bd50144
cmake: update PDB support condition
...
Unfortunately there is no stable support for installation of PDB files in CMake.
This patch is just eliminate problems with modern versions.
2016-12-15 19:13:44 +03:00
Alexander Alekhin
cc09f5a7de
Merge pull request #7854 from alalek:backports_2016
...
(2.4) Backports from master branch (#7854 )
2016-12-15 18:09:44 +02:00
Alexander Alekhin
49e6bb2993
Merge pull request #7868 from alalek:icc_2.4
...
(2.4) Build with ICC
2016-12-15 18:09:17 +02:00
Alexander Alekhin
667cb2e9fc
Merge pull request #7867 from alalek:cuda_warnings_2.4
...
(2.4) Fix CUDA warnings
2016-12-15 18:09:12 +02:00
mshabunin
bfde5cdde0
SGBM: fixed uninitialized memory in cost buffer
2016-12-15 19:08:14 +03:00
Addison Elliott
eb04b2bfa9
Added N-dim submat selection with vectors
...
Currently, to select a submatrix of a N-dimensional matrix, it requires
two lines of code while only one line of code is required if using a 2D
array.
I added functionality to be able to select an N-dim submatrix using a
vector list instead of a Range pointer. This allows initializer lists to
be used for a one-line selection.
2016-12-15 09:16:40 -06:00
Alexander Alekhin
a8c7a1029e
Merge pull request #7817 from savuor:openvx_pyrWrap
2016-12-15 14:56:06 +00:00
