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
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
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
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
Elena Gvozdeva
90ac88cb8e
use std::min,max
2014-07-30 14:28:02 +04:00
vbystricky
bd8894002e
Fix some problems
2014-07-30 11:56:28 +04:00
Fco. Javier Delgado del Hoyo
d3d0434f07
Removed opencv_legacy dependency from cudaoptflow
2014-07-30 09:00:23 +02:00
vbystricky
878dec65c8
Optimize OpenCL version of morfology and box filters for small filter kernels
2014-07-30 10:32:52 +04:00
Sergei Nikulov
eaec132091
#2992 : update after review
2014-07-30 00:03:41 +04:00
Vadim Pisarevsky
ba3783d205
initial commit; ml has been refactored; it compiles and the tests run well; some other modules, apps and samples do not compile; to be fixed
2014-07-29 23:54:23 +04:00
Vadim Pisarevsky
dce1824a91
Merge pull request #2940 from davembradley:master
2014-07-29 17:22:30 +00:00
Vadim Pisarevsky
cf2a307832
Merge pull request #2991 from kovand11:calibrateDebevecFix
2014-07-29 16:58:32 +00:00
Andrey Pavlenko
4c8a9c5d70
Merge pull request #3012 from vpisarev:clean_objdetect
2014-07-29 15:29:35 +00:00
Vadim Pisarevsky
101769d26c
eliminated some unnecessary instructions
2014-07-29 18:10:18 +04:00
Vadim Pisarevsky
a1791c6be3
Merge pull request #3016 from fradelg:master
2014-07-29 13:50:35 +00:00
Fco. Javier Delgado del Hoyo
b8bc99676d
Another typo in comment inside OpenNI2 cmake file
2014-07-29 11:13:00 +02:00
Fco. Javier Delgado del Hoyo
6e4562bb56
Fixed typo in OpenNI2 cmake file
2014-07-29 11:10:58 +02:00
Elena Gvozdeva
dbb5993d13
added dft for all platforms
2014-07-29 12:21:52 +04:00
Elena Gvozdeva
dc3c691c8c
new block size for dft
2014-07-29 12:06:20 +04:00
Elena Gvozdeva
e7216a5987
Used float instead of int for CV_8U in sumTemplate
2014-07-29 11:34:39 +04:00
Vadim Pisarevsky
277802483f
Merge pull request #2987 from anishp:master
2014-07-28 21:15:39 +00:00
Vadim Pisarevsky
e9bed17d98
Merge pull request #3008 from jet47:fix-cudacodec-dependecies
2014-07-28 21:13:59 +00:00
siddharth
4cdc155eac
test
2014-07-29 00:15:11 +05:30
siddharth
0972a2d758
Fixed mixed cloning bug
2014-07-29 00:15:11 +05:30
siddharth
88d05a89d4
removed build error
...
Whitespaces removed
2014-07-29 00:15:11 +05:30
siddharth
14d0b763ec
changed demo tutorial path
2014-07-29 00:15:11 +05:30
siddharth
1a14d8506d
recursive filter output corrected
2014-07-29 00:15:11 +05:30
siddharth
14631be59f
Updated Documentation
2014-07-29 00:15:11 +05:30
Vadim Pisarevsky
41df63aacd
Merge pull request #3010 from vpisarev:ocl_disable_some_norms2
2014-07-28 17:24:42 +00:00
Vadim Pisarevsky
a587759d76
Merge pull request #2989 from smvv:gstreamer_capture_init
2014-07-28 16:00:33 +00:00
Vadim Pisarevsky
962b519708
Merge pull request #2996 from akarsakov:ocl_dft_new_concept
2014-07-28 15:59:59 +00:00
Vadim Pisarevsky
0c749fd7e5
Merge pull request #2998 from ernest-galbrun:cuda_concurrency
2014-07-28 15:59:43 +00:00
Vadim Pisarevsky
af83884dc7
disabled ocl_minmaxloc on 32-bit data completely
2014-07-28 19:35:06 +04:00
Vadim Pisarevsky
1925fab427
disabled some more stuff
2014-07-28 19:32:06 +04:00
Vadim Pisarevsky
11e9e375a3
fixed compile warning with GCC
2014-07-28 19:23:46 +04:00
Vadim Pisarevsky
2fd01dcced
fixed doc builder warnings
2014-07-28 17:18:28 +04:00
Vadim Pisarevsky
97f6dd1820
trying to make OpenCL builder green
2014-07-28 17:16:02 +04:00
