Alexander Alekhin
c9237a6f48
cmake: unpack IPPICV into binary directory
2016-12-16 18:43:54 +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
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
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
Alexander Alekhin
a8c7a1029e
Merge pull request #7817 from savuor:openvx_pyrWrap
2016-12-15 14:56:06 +00:00
Maksim Shabunin
7d5fd6a800
Merge pull request #7812 from alalek:fix_putText
2016-12-15 13:33:56 +00:00
Alexander Alekhin
041502e42c
build: eliminate ICC warnings
2016-12-15 16:03:15 +03:00
Alexander Alekhin
737fa519d1
test: use relative error in HOG tests
2016-12-15 15:58:16 +03:00
Alexander Alekhin
ceb5210bfb
build: eliminate ICC PCH warning
2016-12-15 15:58:16 +03:00
Alexander Alekhin
dbbbad40fb
build: eliminate ICC warnings
2016-12-15 15:57:40 +03:00
Alexander Alekhin
540ece74a5
cmake: support ICC warnings
2016-12-15 15:57:27 +03:00
Alexander Alekhin
3fc06f14d4
cmake: use -fp-model precise with ICC
2016-12-15 15:56:31 +03:00
Alexander Alekhin
d206e84a13
cmake: use -fp-model precise with ICC
2016-12-15 15:50:30 +03:00
Alexander Alekhin
03beff06ff
build: disable warnings (Ubuntu 16.04 + CUDA 8.0)
...
Examples:
- NPP_staging.cu:1606:105: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
- NCVHaarObjectDetection.hpp:95:37: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
2016-12-15 15:47:41 +03:00
StevenPuttemans
6d34d6b47e
update samples: waitKey() usage
...
Original commit is a5f19f7dd6
2016-12-15 15:39:47 +03:00
Cartucho
fcddfa4f86
GSoC 2016 - Adding ALIASES for tutorial ( #7041 )
...
* GSoC 2016 - Adding toggle files to be used by tutorials.
Add a toggle option for tutorials.
* adds a button on the HTML tutorial pages to switch between blocks
* the default option is for languages: one can write a block
for C++ and another one for Python without re-writing the tutorial
Add aliases to the doxyfile.
* adding alises to make a link to previous and next tutorial.
* adding alias to specify the toggle options in the tutorials index.
* adding alias to add a youtube video directly from link.
Add a sample tutorial (mat_mask_opertaions) using the developed aliases:
* youtube alias
* previous and next tutorial alias
* buttons
* languages info for tutorial table of content
* code referances with snippets (and associated sample code files)
* Removing the automatic ordering.
Adding specific toggles for cpp, java and python.
Move all the code to the footer / header and Doxyfile.
Updating documentation.
2016-12-15 15:32:12 +03:00
Rostislav Vasilikhin
45d3286168
wrappers for vx_pyramid added
2016-12-15 15:00:26 +03:00
Alexander Alekhin
4e7b521438
highgui: change waitKey() default behaviour
...
The old behaviour is available via waitKeyEx() call or
via setting of OPENCV_LEGACY_WAITKEY environment variable
2016-12-15 14:17:38 +03:00
Addison Elliott
fa6692afcf
Added new overloaded functions for Mat and UMat that accepts std::vector<int> instead of int * for the sizes on a N-dimensional array.
...
This allows for an N-dimensional array to be setup in one line instead of two when using C++11 initializer lists. cv::Mat(3, {zDim, yDim, xDim}, ...) can be used instead of having to create an int pointer to hold the size array.
2016-12-14 13:52:03 -06:00
Alexander Alekhin
36b5abf6b7
Merge pull request #7857 from savuor:openvx_macro_wrappers
2016-12-14 16:40:09 +00:00
Alexander Alekhin
059c2a8328
Merge pull request #7856 from mshabunin:long-tests
2016-12-14 15:52:23 +00:00
Maksim Shabunin
daa97021bd
Merge pull request #7810 from parismita:patch-1
2016-12-14 14:54:53 +00:00
Rostislav Vasilikhin
8b9422a052
OpenVX wrappers rewritten with CV_OVX_RUN, VX_DbgThrow
2016-12-14 17:49:41 +03:00
mshabunin
f5bf1e510b
Test run script: added long test filter for valgrind
2016-12-14 17:16:08 +03:00
Alexander Alekhin
5592142511
Merge pull request #7831 from terfendail:ovx_array_update
2016-12-14 14:08:47 +00:00
Vitaly Tuzov
3c5eb513dd
Fixed OpenVX to OpenCV compatibility for NN remap
2016-12-14 16:53:07 +03:00
Vitaly Tuzov
f8b4d28745
Added OpenVX based processing to remap
2016-12-14 16:53:04 +03:00
Vitaly Tuzov
138f0cbf3c
Added wrapper for IMAGE_SPACE attribute setter
2016-12-14 15:40:50 +03:00
Alexander Alekhin
53f72f18f5
Merge pull request #7853 from mshabunin:fix-doc-warning
...
Documentation fixes for latest doxygen
2016-12-14 13:52:27 +02:00
mshabunin
965deaba8d
Documentation fixes for latest doxygen
2016-12-14 14:14:13 +03:00
Alexander Alekhin
8b92151ef0
Merge pull request #7832 from alalek:install_docs_target
2016-12-14 11:05:04 +00:00
Alexander Alekhin
7db13c7aab
Merge pull request #7847 from alalek:install_docs_target_2.4
2016-12-14 11:01:57 +00:00
Alexander Alekhin
af0ee306cf
Merge pull request #7819 from alalek:fix_mulSpectrums_inplace_2.4
2016-12-14 11:00:54 +00:00
Maksim Shabunin
1451f7d0ec
Merge pull request #7848 from rjray-nvidia:cuda_tegra_tutorial_update_1
2016-12-14 10:21:13 +00:00