Ernest Galbrun
ae26368e78
Merge branch 'master' into cuda_concurrency
2014-07-31 16:03:51 +02:00
Ernest Galbrun
917107e635
removed bm legacy
2014-07-31 16:01:54 +02:00
Alexander Alekhin
17a6b8cdc0
Merge pull request #3021 from ElenaGvozdeva:ocl_flip
2014-07-31 13:56:44 +00:00
Vladislav Vinogradov
7030a1f9a2
fix cudabgsegm module compilation
2014-07-31 17:55:59 +04:00
Elena Gvozdeva
9db8592aa8
fixed ocl_flip for cn==3
2014-07-31 16:57:47 +04:00
Vadim Pisarevsky
2f2a9ad536
Merge pull request #3020 from vpisarev:ocl_disable_more_funcs
2014-07-31 12:54:13 +00:00
Vadim Pisarevsky
b0cd822924
trying to make the tests pass
2014-07-31 14:24:21 +04:00
Vadim Pisarevsky
10b60f8d16
continuing refactoring ml samples; added "max vote" response to ANN_MLP. Probably, should make it in less hacky way
2014-07-31 14:12:10 +04:00
edgarriba
56704b5e95
Update tutorial
2014-07-31 11:47:59 +02:00
edgarriba
08e8f9ca45
Added some definitions
2014-07-31 11:47:26 +02:00
Michael Pratt
52df3b232d
Reference PYTHON_NUMPY_INCLUDE_DIRS not PYTHON_NUMPY_INCLUDE_PATH
...
PYTHON_NUMPY_INCLUDE_PATH was a typo, it should have been
PYTHON_NUMPY_INCLUDE_DIRS.
2014-07-31 03:27:06 -04:00
Fco. Javier Delgado del Hoyo
fd10557e78
Removed cvCalcOpticalFlowBM from cudaoptflow test
2014-07-31 09:21:44 +02:00
Fco. Javier Delgado del Hoyo
8def44047a
Removed cvCalcOpticalFlowBM from performance test
2014-07-31 09:08:29 +02:00
Michael Pratt
c9876c3cd8
Merge branch 'master' into python2and3
2014-07-31 01:13:16 -04:00
Samson Yilma
4fe04775d1
Merge remote-tracking branch 'upstream/master' into HomographyDecomp
2014-07-30 20:36:41 -04:00
Samson Yilma
3b608fa489
added comment.
2014-07-30 19:32:37 -04:00
Samson Yilma
3c5eb7de84
updated documentation for decomposeHomography
2014-07-30 18:53:33 -04:00
Vadim Pisarevsky
223cdcd0ee
fixed compilation of some samples; fixed ANN_MLP::predict
2014-07-30 22:53:46 +04:00
Vadim Pisarevsky
1a1097ab23
Merge pull request #2983 from wnoise:shrink-global-cuda-usage
2014-07-30 15:55:02 +00:00
Vadim Pisarevsky
ef8647fe30
put IPP ReduceSum_32f back
2014-07-30 19:12:11 +04:00
edgarriba
9a25cb012d
Update some text
2014-07-30 17:05:06 +02:00
Vadim Pisarevsky
2ab7fb6051
Merge pull request #3017 from f-morozov:akaze
2014-07-30 15:03:47 +00:00
Vadim Pisarevsky
5267ed46c7
1. disabled OpenCL acceleration for cv::multiply() (CV_32F), cv::divide (CV_32F), cv::convertScaleAbs (CV_32F) and cv::reduce (SUM, CV_32F), cv::reduce (MIN & MAX), cv::flip (3-channel case).
...
2. changed the number of test loops from 1 to 30 (except for cv::pow() test, which fails for yet unknown reason)
3. disabled IPP acceleration for 3-channel norms.
4. modified relativeNorm test function to handle very small values
2014-07-30 18:19:47 +04:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
edgarriba
85ccac2633
Added help()
2014-07-30 15:23:52 +02:00
Vadim Pisarevsky
a782ee93de
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
2014-07-30 12:48:41 +00:00
Vadim Pisarevsky
e368f17caf
fixed python bindings generation
2014-07-30 16:11:08 +04:00
edgarriba
4a86900761
Added help()
2014-07-30 13:32:27 +02:00
edgarriba
69f1ee8732
Code tutorial
2014-07-30 13:08:19 +02:00
edgarriba
6ff58f02e2
Code tutorial
2014-07-30 12:57:18 +02:00
edgarriba
94968c81e0
Code tutorial
2014-07-30 12:57:11 +02:00
edgarriba
b58979d057
Code tutorial
2014-07-30 12:57:04 +02:00
edgarriba
38c2cc8521
Code tutorial
2014-07-30 12:56:55 +02:00
edgarriba
31bec45998
Code tutorial
2014-07-30 12:56:46 +02:00
edgarriba
b33a2f24fa
Code tutorial
2014-07-30 12:56:30 +02:00
edgarriba
9d18f5c458
Code tutorial
2014-07-30 12:56:22 +02:00
edgarriba
6f5876f8f7
Code tutorial
2014-07-30 12:55:35 +02:00
edgarriba
2848f43acc
Code tutorial
2014-07-30 12:54:49 +02:00
edgarriba
319dbd2eb7
Code tutorial
2014-07-30 12:53:43 +02:00
edgarriba
924e062426
Code tutorial
2014-07-30 12:53:24 +02:00
edgarriba
3b24aa2441
Code tutorial
2014-07-30 12:53:14 +02:00
edgarriba
be4c1afb0b
Code tutorial
2014-07-30 12:53:06 +02:00
edgarriba
550e3721ae
Code tutorial
2014-07-30 12:51:59 +02:00
edgarriba
64c164c111
Code tutorial
2014-07-30 12:39:46 +02:00
edgarriba
74e52df3cd
Code tutorial
2014-07-30 12:33:27 +02:00
edgarriba
7334e54a63
Code tutorial
2014-07-30 12:31:19 +02:00
Elena Gvozdeva
90ac88cb8e
use std::min,max
2014-07-30 14:28:02 +04:00
edgarriba
0ac84755a0
Update tutorial
2014-07-30 12:10:29 +02:00
edgarriba
b6b0c2aa8e
MACRO for EIGEN libraries
2014-07-30 11:22:25 +02:00
vbystricky
bd8894002e
Fix some problems
2014-07-30 11:56:28 +04:00