Commit Graph

8304 Commits

Author SHA1 Message Date
Alexander Smorkalov
0b41df46ad Merge pull request #1499 from georgebrindeiro:patch-2 2013-09-25 17:24:20 +04:00
Alexander Smorkalov
887ff0de7b Merge pull request #1498 from alalek:revert_1487 2013-09-25 11:27:26 +04:00
George Andrew Brindeiro
192ca711ef Added nonfree headers that are required for using SURF features 2013-09-24 12:59:37 -03:00
Alexander Smorkalov
6057414a93 Merge pull request #1199 from devernay:2.4-qtkit 2013-09-24 15:36:16 +04:00
Alexander Alekhin
ce557fb7be Revert "cmake: fixed incorrect usage of add_definitions() on Linux"
This reverts commit 286244efed.
2013-09-24 15:12:24 +04:00
Alexander Smorkalov
36e7697d1b Merge pull request #1351 from barisdemiroz:eclipse-java-tutorial 2013-09-24 14:44:33 +04:00
Alexander Smorkalov
d6d8e96003 Merge pull request #1489 from melody-rain:2_4_knearest_neighbor 2013-09-23 13:34:39 +04:00
Alexander Smorkalov
0cd3d1f4d6 Merge pull request #1482 from ilya-lavrenov:ocl_setTO 2013-09-23 12:56:20 +04:00
Alexander Smorkalov
43485a212d Merge pull request #1487 from alalek:fix_add_definitions 2013-09-23 12:54:20 +04:00
Jin Ma
b88f5302e2 Removed unused constructor. 2013-09-23 15:10:00 +08:00
Alexander Smorkalov
02247de339 Merge pull request #1483 from kecsap:nbayes 2013-09-23 10:26:45 +04:00
Jin Ma
1bfe39f485 Added knearest neighbor of OpenCL version.
It includes the accuracy/performance test and the implementation of KNN.
2013-09-22 10:23:54 +08:00
Jin Ma
06c33df307 Added knearest neighbor of OpenCL version.
It includes the accuracy/performance test and the implementation of KNN.
2013-09-22 10:22:09 +08:00
Alexander Alekhin
286244efed cmake: fixed incorrect usage of add_definitions() on Linux 2013-09-21 21:12:39 +04:00
Csaba Kertesz
6fb3b4f41c Fix a memory leak in CvNormalBayesClassifier::train() 2013-09-20 22:36:49 +02:00
Ilya Lavrenov
362a67a695 fixed ocl::oclMat::setTo for 2-channel images 2013-09-20 15:57:38 +04:00
Alexander Smorkalov
94966b38c0 Merge pull request #1448 from StevenPuttemans:bugfix_3264 2013-09-20 10:55:24 +04:00
Andrey Pavlenko
d08b163657 Merge pull request #1468 from alalek:fix_alignSize_usage 2013-09-18 13:30:38 +04:00
Alexander Alekhin
f1b5cbc8fe ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp 2013-09-18 01:14:41 +04:00
Alexander Smorkalov
6fae07ba88 Merge pull request #1460 from ilya-lavrenov:ocl_divUp 2013-09-17 15:37:44 +04:00
Alexander Smorkalov
14951dc387 Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations 2013-09-17 15:21:34 +04:00
Alexander Smorkalov
d437183388 Merge pull request #1439 from ilya-lavrenov:convertTo 2013-09-17 15:12:02 +04:00
Alexander Smorkalov
9cf301e257 Merge pull request #1449 from SpecLad:dc1394-095 2013-09-17 14:36:30 +04:00
Alexander Smorkalov
8853d19e74 Merge pull request #1452 from alalek:fix_cv_export_templates 2013-09-17 14:35:40 +04:00
Andrey Pavlenko
b3bb42773b Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp 2013-09-17 14:03:40 +04:00
Alexander Smorkalov
2dceb68a21 Merge pull request #1455 from ilya-lavrenov:ocl_test_output 2013-09-17 13:18:52 +04:00
Ilya Lavrenov
6a26c4483f added performance tests for data transfer operations 2013-09-16 23:51:36 +04:00
Ilya Lavrenov
58b84c2fc0 removed needless divUp 2013-09-16 15:48:30 +04:00
Ilya Lavrenov
e0325fe057 removed useless output 2013-09-15 22:04:22 +04:00
Ilya Lavrenov
a5c9d83617 fixed ocl::pyrUp for 2-byte types 2013-09-15 19:56:05 +04:00
Alexander Alekhin
0ee47502d9 remove CV_EXPORT from templates 2013-09-15 13:48:54 +04:00
Andrey Pavlenko
f9c6123439 Merge pull request #1444 from ilya-lavrenov:ocl_test_mog 2013-09-13 19:53:21 +04:00
Roman Donchenko
671e5e39b1 Dropped the HAVE_DC1394_095 configuration macro.
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.

Note that 1.0 doesn't have the do_extra_buffering parameter.
2013-09-13 17:25:21 +04:00
StevenPuttemans
199aa80915 Added typo in docs of tutorial 2013-09-13 15:01:18 +02:00
Ilya Lavrenov
9311f84109 disabled MOG tests if no video input support 2013-09-13 12:47:25 +04:00
Roman Donchenko
e3710488a8 Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp 2013-09-12 16:54:21 +04:00
Roman Donchenko
dee2a65978 Merge pull request #1440 from SpecLad:wcast-align 2013-09-12 13:56:23 +04:00
Roman Donchenko
ad52dd37a9 Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"
This reverts commit 41b8479d03, reversing
changes made to 531471b0aa.

Reason: breaks the build.
2013-09-12 12:58:10 +04:00
Roman Donchenko
ac9bc6423a Merge pull request #1428 from ilya-lavrenov:ocl_pyr 2013-09-12 12:48:45 +04:00
Ilya Lavrenov
f20cc2bce8 extended ocl::convertTo 2013-09-12 12:39:03 +04:00
Roman Donchenko
fec697b390 Silenced a few -Wcast-align warnings in the headers.
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
2013-09-12 12:33:56 +04:00
Roman Donchenko
f31d06f980 Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft 2013-09-12 12:19:37 +04:00
Roman Donchenko
8d438e3def Merge pull request #1386 from asmorkalov:android_abic_check_opt_java 2013-09-12 12:18:55 +04:00
Alexander Smorkalov
3fc6e27a69 Some improvements in ABI compatibility checker config generator.
JNI check became optional;
Pathes to SDK, NDK and Java API level can be defined by command line.
2013-09-12 11:43:13 +04:00
Jin Ma
f4d0c9b13c Revised the code according to the feedback of the community. 2013-09-12 09:43:30 +08:00
Roman Donchenko
caf9fdbdc3 Merge pull request #1432 from SpecLad:unseq 2013-09-11 13:50:36 +04:00
Roman Donchenko
6fcd9e3830 Merge pull request #1431 from asmorkalov:android_recording_hint 2013-09-11 13:50:03 +04:00
Jin Ma
b9d7e67589 Removed whitespace. 2013-09-11 11:28:36 +08:00
Jin Ma
2e0f613c38 Added performance for Kalman Filter. 2013-09-11 10:19:02 +08:00
Roman Donchenko
6a21eca7e7 Merge pull request #1421 from ilya-lavrenov:ocl_bilateral 2013-09-10 18:59:41 +04:00