edgarriba
|
a3e74ec521
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
|
2014-08-05 12:59:47 +02:00 |
|
Vadim Pisarevsky
|
a05ce00a65
|
Merge pull request #2879 from alalek:ocl_runtime_flags
|
2014-08-04 16:43:01 +00:00 |
|
Vadim Pisarevsky
|
a58767eff8
|
Merge pull request #3036 from vbystricky:ocl_NormAccurTestFix
|
2014-08-04 14:54:12 +00:00 |
|
Vadim Pisarevsky
|
432b7cb235
|
Merge pull request #3032 from vpisarev:refactor_ml2
|
2014-08-04 14:51:38 +00:00 |
|
vbystricky
|
2d587ad691
|
Prevent generating test case with mask filled 0 only
|
2014-08-04 15:12:36 +04:00 |
|
Vladislav Vinogradov
|
a3da3a01e1
|
fix test_opencv_imgproc compilation
|
2014-08-04 12:13:33 +04:00 |
|
Vladislav Vinogradov
|
cdb7b83741
|
fix python module compilation with enabled CUDA support:
filterout all CUDA related headers from python module include headers
|
2014-08-04 12:12:51 +04:00 |
|
Alexander Alekhin
|
add9ce46c3
|
Merge pull request #3030 from vbystricky:ocl_DotReduceAccurTestFix
|
2014-08-04 08:09:38 +00:00 |
|
Vadim Pisarevsky
|
222f8a3d5e
|
hopefully fixed test failure on Linux
|
2014-08-04 01:16:45 +04:00 |
|
Vadim Pisarevsky
|
24b01a8e4f
|
continuing to debug boost and fix MSVC compile errors
|
2014-08-03 21:21:11 +04:00 |
|
Vadim Pisarevsky
|
98a1181240
|
fixed the condition
|
2014-08-03 13:15:43 +04:00 |
|
Vadim Pisarevsky
|
79b593d8d8
|
more fixes and more debugging code
|
2014-08-03 13:08:03 +04:00 |
|
Vadim Pisarevsky
|
eeb786fcfd
|
fixed compile warnings from MSVC; fixed warnings in Python bindings; added some debugging code
|
2014-08-03 12:46:28 +04:00 |
|
Vadim Pisarevsky
|
9cb79b9abb
|
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
|
2014-08-03 04:28:31 +04:00 |
|
Vadim Pisarevsky
|
8e9d1d9fe6
|
temporarily disabled java bindings for ml; hopefully fixed warnings etc.
|
2014-08-03 04:28:20 +04:00 |
|
Vadim Pisarevsky
|
2520e335d1
|
removed many extra whitespaces; fixed 1 warning
|
2014-08-03 03:08:25 +04:00 |
|
Vadim Pisarevsky
|
28ca6ac05e
|
fixed building html docs
|
2014-08-03 02:34:47 +04:00 |
|
Vadim Pisarevsky
|
d3cdfefa03
|
Merge pull request #3027 from vbystricky:cvtColorLuv2RGB
|
2014-08-02 21:52:24 +00:00 |
|
Vadim Pisarevsky
|
c6593d02a6
|
updated docs
|
2014-08-03 01:41:30 +04:00 |
|
Vadim Pisarevsky
|
c20ff6ce19
|
made everything compile and even run somehow
|
2014-08-03 01:41:09 +04:00 |
|
VBystricky
|
2026094691
|
Increase epsilon for OpenCL version UMatDot and ReduceAvg accurency tests
|
2014-08-02 13:21:34 +04:00 |
|
Alexander Alekhin
|
c595457ea0
|
Merge pull request #3011 from vbystricky:oclopt_morthosmall
|
2014-08-01 17:21:59 +00:00 |
|
Alexander Alekhin
|
11dd36f3aa
|
Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix
|
2014-08-01 17:15:53 +00:00 |
|
Alexander Alekhin
|
b33a093844
|
Merge pull request #3029 from vbystricky:ocl_UMatOpAccurTestFix
|
2014-08-01 17:15:38 +00:00 |
|
VBystricky
|
0f9b79ef64
|
Change min-max to clamp
|
2014-08-01 19:45:11 +04:00 |
|
vbystricky
|
aad4104297
|
Fix accurency test for OpenCL matrix operations
|
2014-08-01 18:30:20 +04:00 |
|
vbystricky
|
184c5917bf
|
Fix accurency test of OpenCL merge function.
|
2014-08-01 17:53:24 +04:00 |
|
Vadim Pisarevsky
|
936536a284
|
Merge pull request #2671 from syilma:HomographyDecomp
|
2014-08-01 13:08:20 +00:00 |
|
Vadim Pisarevsky
|
d01ca30f55
|
Merge pull request #3018 from fradelg:master
|
2014-08-01 13:06:36 +00:00 |
|
vbystricky
|
b724208510
|
Fix Luv2RGB function
|
2014-08-01 16:39:12 +04:00 |
|
Vadim Pisarevsky
|
345b69d5f7
|
Merge pull request #3024 from jet47:fix-cudabgsegm-compilation
|
2014-08-01 09:42:40 +00:00 |
|
Vadim Pisarevsky
|
05164bf713
|
Merge pull request #2608 from Siddharthk:master
|
2014-08-01 09:13:32 +00:00 |
|
Alexander Alekhin
|
b3e31fb8d6
|
Merge pull request #3023 from vbystricky:ocl_minMaxLoc
|
2014-08-01 08:57:37 +00:00 |
|
edgarriba
|
3e2a57ff35
|
Update for non Eigen users
|
2014-08-01 10:48:39 +02:00 |
|
Fco. Javier Delgado del Hoyo
|
625fd61313
|
Removed OpticalFlowBM test from cudaoptflow module
|
2014-08-01 09:28:19 +02:00 |
|
Vadim Pisarevsky
|
18de8dee62
|
Merge pull request #3009 from vpisarev:ios_experiments
|
2014-07-31 18:20:07 +00:00 |
|
Alexander Alekhin
|
f8aecb2a32
|
Merge pull request #3002 from vbystricky:oclopt_pyrdown
|
2014-07-31 15:43:18 +00:00 |
|
vbystricky
|
b48e487d53
|
Enable ocl version of minmaxloc with mask
|
2014-07-31 19:12:10 +04:00 |
|
vbystricky
|
11a0e3ff78
|
Fix error in OCL minmaxloc
|
2014-07-31 19:04:38 +04: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 |
|
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 |
|
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 |
|