Andrey Pavlenko [Thu, 26 Sep 2013 11:50:54 +0000 (15:50 +0400)]
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
Alexander Smorkalov [Thu, 26 Sep 2013 08:16:01 +0000 (12:16 +0400)]
Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
Alexander Smorkalov [Thu, 26 Sep 2013 05:30:25 +0000 (09:30 +0400)]
Merge pull request #1500 from alalek:fix_add_definitions
Alexander Smorkalov [Thu, 26 Sep 2013 05:30:01 +0000 (09:30 +0400)]
Merge pull request #1502 from melody-rain:2.4_Stereo_Match_Const_Space_BP
Ilya Lavrenov [Wed, 25 Sep 2013 12:18:04 +0000 (16:18 +0400)]
changes in OpenCL matrix operations docs
Alexander Smorkalov [Wed, 25 Sep 2013 13:24:19 +0000 (17:24 +0400)]
Merge pull request #1499 from georgebrindeiro:patch-2
Ilya Lavrenov [Wed, 25 Sep 2013 11:28:12 +0000 (15:28 +0400)]
replaced manually new/delete by AutoBuffer
Ilya Lavrenov [Wed, 25 Sep 2013 11:02:47 +0000 (15:02 +0400)]
fixed minMaxLoc kernel (removed compilation errors)
Ilya Lavrenov [Tue, 24 Sep 2013 18:54:13 +0000 (22:54 +0400)]
reverted and generalized original ocl::transpose
Jin Ma [Wed, 25 Sep 2013 09:42:56 +0000 (17:42 +0800)]
Resolved the bug that the work group size is not valid.
Alexander Alekhin [Tue, 24 Sep 2013 16:17:39 +0000 (20:17 +0400)]
cmake: PCH: use DEFINE_SYMBOL target property
Alexander Alekhin [Sat, 21 Sep 2013 17:12:39 +0000 (21:12 +0400)]
cmake: fixed incorrect usage of add_definitions() on Linux
Alexander Smorkalov [Wed, 25 Sep 2013 07:27:25 +0000 (11:27 +0400)]
Merge pull request #1498 from alalek:revert_1487
George Andrew Brindeiro [Tue, 24 Sep 2013 15:59:37 +0000 (12:59 -0300)]
Added nonfree headers that are required for using SURF features
Alexander Smorkalov [Tue, 24 Sep 2013 11:36:16 +0000 (15:36 +0400)]
Merge pull request #1199 from devernay:2.4-qtkit
Alexander Alekhin [Tue, 24 Sep 2013 11:12:24 +0000 (15:12 +0400)]
Revert "cmake: fixed incorrect usage of add_definitions() on Linux"
This reverts commit
286244efedd215600b6be72d4c25e48af0ed1c2d.
Alexander Smorkalov [Tue, 24 Sep 2013 10:44:32 +0000 (14:44 +0400)]
Merge pull request #1351 from barisdemiroz:eclipse-java-tutorial
Ilya Lavrenov [Tue, 24 Sep 2013 10:18:42 +0000 (14:18 +0400)]
removed arithm_absdiff.cl
Ilya Lavrenov [Tue, 24 Sep 2013 10:13:10 +0000 (14:13 +0400)]
refactored arithm.cpp. Extended param list for all the tests
Ilya Lavrenov [Tue, 24 Sep 2013 10:07:54 +0000 (14:07 +0400)]
refactoed and extended ocl::transpose
Ilya Lavrenov [Tue, 24 Sep 2013 10:02:01 +0000 (14:02 +0400)]
refactored and extended ocl::exp and ocl::log
Ilya Lavrenov [Tue, 24 Sep 2013 09:58:18 +0000 (13:58 +0400)]
refactored and extended ocl::compare
Ilya Lavrenov [Tue, 24 Sep 2013 09:54:46 +0000 (13:54 +0400)]
refactored and extended binary bitwise operations
Ilya Lavrenov [Tue, 24 Sep 2013 09:51:37 +0000 (13:51 +0400)]
refactored and extended ocl::addWeighted
Ilya Lavrenov [Tue, 24 Sep 2013 09:49:38 +0000 (13:49 +0400)]
refactored and extended ocl::LUT
Ilya Lavrenov [Tue, 24 Sep 2013 09:43:12 +0000 (13:43 +0400)]
removed comments from filtering.cpp and imgproc.cpp in ocl module
Ilya Lavrenov [Tue, 24 Sep 2013 09:39:07 +0000 (13:39 +0400)]
removed ocl::magnitudeSqr
Ilya Lavrenov [Tue, 24 Sep 2013 09:34:55 +0000 (13:34 +0400)]
refactored and extended arithm operations add/sub/mul/div/absdiff
Ilya Lavrenov [Tue, 24 Sep 2013 09:17:09 +0000 (13:17 +0400)]
marked some methods of ocl::Context as const
Ilya Lavrenov [Tue, 24 Sep 2013 09:15:05 +0000 (13:15 +0400)]
removed needless arithm_2_mat.cl file
StevenPuttemans [Tue, 17 Sep 2013 11:05:28 +0000 (13:05 +0200)]
Attempt at fixing bug 3186
Alexander Smorkalov [Mon, 23 Sep 2013 09:34:38 +0000 (13:34 +0400)]
Merge pull request #1489 from melody-rain:2_4_knearest_neighbor
Alexander Smorkalov [Mon, 23 Sep 2013 08:56:19 +0000 (12:56 +0400)]
Merge pull request #1482 from ilya-lavrenov:ocl_setTO
Alexander Smorkalov [Mon, 23 Sep 2013 08:54:19 +0000 (12:54 +0400)]
Merge pull request #1487 from alalek:fix_add_definitions
Jin Ma [Mon, 23 Sep 2013 07:10:00 +0000 (15:10 +0800)]
Removed unused constructor.
Alexander Smorkalov [Mon, 23 Sep 2013 06:26:44 +0000 (10:26 +0400)]
Merge pull request #1483 from kecsap:nbayes
Jin Ma [Sun, 22 Sep 2013 02:23:54 +0000 (10:23 +0800)]
Added knearest neighbor of OpenCL version.
It includes the accuracy/performance test and the implementation of KNN.
Jin Ma [Sun, 22 Sep 2013 02:22:09 +0000 (10:22 +0800)]
Added knearest neighbor of OpenCL version.
It includes the accuracy/performance test and the implementation of KNN.
Alexander Alekhin [Sat, 21 Sep 2013 17:12:39 +0000 (21:12 +0400)]
cmake: fixed incorrect usage of add_definitions() on Linux
Csaba Kertesz [Wed, 18 Sep 2013 19:49:32 +0000 (21:49 +0200)]
Fix a memory leak in CvNormalBayesClassifier::train()
Ilya Lavrenov [Fri, 20 Sep 2013 10:22:18 +0000 (14:22 +0400)]
fixed ocl::oclMat::setTo for 2-channel images
Alexander Smorkalov [Fri, 20 Sep 2013 06:55:23 +0000 (10:55 +0400)]
Merge pull request #1448 from StevenPuttemans:bugfix_3264
Andrey Pavlenko [Wed, 18 Sep 2013 09:30:38 +0000 (13:30 +0400)]
Merge pull request #1468 from alalek:fix_alignSize_usage
Alexander Alekhin [Tue, 17 Sep 2013 21:14:41 +0000 (01:14 +0400)]
ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp
Alexander Smorkalov [Tue, 17 Sep 2013 11:37:44 +0000 (15:37 +0400)]
Merge pull request #1460 from ilya-lavrenov:ocl_divUp
Alexander Smorkalov [Tue, 17 Sep 2013 11:21:34 +0000 (15:21 +0400)]
Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations
Alexander Smorkalov [Tue, 17 Sep 2013 11:12:01 +0000 (15:12 +0400)]
Merge pull request #1439 from ilya-lavrenov:convertTo
Alexander Smorkalov [Tue, 17 Sep 2013 10:36:30 +0000 (14:36 +0400)]
Merge pull request #1449 from SpecLad:dc1394-095
Alexander Smorkalov [Tue, 17 Sep 2013 10:35:40 +0000 (14:35 +0400)]
Merge pull request #1452 from alalek:fix_cv_export_templates
Andrey Pavlenko [Tue, 17 Sep 2013 10:03:40 +0000 (14:03 +0400)]
Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp
Alexander Smorkalov [Tue, 17 Sep 2013 09:18:51 +0000 (13:18 +0400)]
Merge pull request #1455 from ilya-lavrenov:ocl_test_output
Ilya Lavrenov [Mon, 16 Sep 2013 14:55:37 +0000 (18:55 +0400)]
added performance tests for data transfer operations
Ilya Lavrenov [Mon, 16 Sep 2013 11:11:56 +0000 (15:11 +0400)]
removed needless divUp
Ilya Lavrenov [Fri, 13 Sep 2013 07:27:25 +0000 (11:27 +0400)]
removed useless output
Ilya Lavrenov [Sun, 15 Sep 2013 15:56:05 +0000 (19:56 +0400)]
fixed ocl::pyrUp for 2-byte types
Alexander Alekhin [Sun, 15 Sep 2013 03:05:30 +0000 (07:05 +0400)]
remove CV_EXPORT from templates
Andrey Pavlenko [Fri, 13 Sep 2013 15:53:20 +0000 (19:53 +0400)]
Merge pull request #1444 from ilya-lavrenov:ocl_test_mog
Roman Donchenko [Fri, 13 Sep 2013 13:25:21 +0000 (17:25 +0400)]
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.
StevenPuttemans [Fri, 13 Sep 2013 13:01:18 +0000 (15:01 +0200)]
Added typo in docs of tutorial
Ilya Lavrenov [Fri, 13 Sep 2013 08:47:25 +0000 (12:47 +0400)]
disabled MOG tests if no video input support
Roman Donchenko [Thu, 12 Sep 2013 12:54:21 +0000 (16:54 +0400)]
Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp
Roman Donchenko [Thu, 12 Sep 2013 09:56:23 +0000 (13:56 +0400)]
Merge pull request #1440 from SpecLad:wcast-align
Roman Donchenko [Thu, 12 Sep 2013 08:58:10 +0000 (12:58 +0400)]
Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"
This reverts commit
41b8479d039bb0ecc36627ae50349b6fcd5e16e3, reversing
changes made to
531471b0aa4b4e8f9fcab8282d5cbe895b77e6e0.
Reason: breaks the build.
Roman Donchenko [Thu, 12 Sep 2013 08:48:44 +0000 (12:48 +0400)]
Merge pull request #1428 from ilya-lavrenov:ocl_pyr
Ilya Lavrenov [Wed, 11 Sep 2013 09:35:39 +0000 (13:35 +0400)]
extended ocl::convertTo
Roman Donchenko [Thu, 12 Sep 2013 08:31:13 +0000 (12:31 +0400)]
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.
Roman Donchenko [Thu, 12 Sep 2013 08:19:36 +0000 (12:19 +0400)]
Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft
Roman Donchenko [Thu, 12 Sep 2013 08:18:54 +0000 (12:18 +0400)]
Merge pull request #1386 from asmorkalov:android_abic_check_opt_java
Alexander Smorkalov [Mon, 2 Sep 2013 13:52:07 +0000 (17:52 +0400)]
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.
Jin Ma [Thu, 12 Sep 2013 01:43:30 +0000 (09:43 +0800)]
Revised the code according to the feedback of the community.
Roman Donchenko [Wed, 11 Sep 2013 09:50:35 +0000 (13:50 +0400)]
Merge pull request #1432 from SpecLad:unseq
Roman Donchenko [Wed, 11 Sep 2013 09:50:02 +0000 (13:50 +0400)]
Merge pull request #1431 from asmorkalov:android_recording_hint
Jin Ma [Wed, 11 Sep 2013 03:28:36 +0000 (11:28 +0800)]
Removed whitespace.
Jin Ma [Wed, 11 Sep 2013 02:19:02 +0000 (10:19 +0800)]
Added performance for Kalman Filter.
Roman Donchenko [Tue, 10 Sep 2013 14:59:41 +0000 (18:59 +0400)]
Merge pull request #1421 from ilya-lavrenov:ocl_bilateral
Alexander Smorkalov [Tue, 10 Sep 2013 14:05:45 +0000 (18:05 +0400)]
MediaRecorder hint enabled for all Android devices with API level 14 and above.
It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
Roman Donchenko [Tue, 10 Sep 2013 14:05:23 +0000 (18:05 +0400)]
Eliminated unsequenced assignments to temp3 from dpstereo.cpp.
They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.
Ilya Lavrenov [Tue, 10 Sep 2013 07:53:34 +0000 (11:53 +0400)]
added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown
Roman Donchenko [Tue, 10 Sep 2013 07:33:24 +0000 (11:33 +0400)]
Merge pull request #1417 from ilya-lavrenov:merge_fix
Roman Donchenko [Tue, 10 Sep 2013 07:32:34 +0000 (11:32 +0400)]
Merge pull request #1420 from ilya-lavrenov:ocl_perf_hog
Roman Donchenko [Tue, 10 Sep 2013 07:28:21 +0000 (11:28 +0400)]
Merge pull request #1413 from melody-rain:2.4_kalman_filter
Roman Donchenko [Mon, 9 Sep 2013 14:33:11 +0000 (18:33 +0400)]
Merge pull request #1376 from StevenPuttemans:bugfix_3186
Ilya Lavrenov [Mon, 9 Sep 2013 14:04:52 +0000 (18:04 +0400)]
increased time limit for bilateral filter performance tests
Ilya Lavrenov [Mon, 9 Sep 2013 13:16:47 +0000 (17:16 +0400)]
fixed HOG perf test
Roman Donchenko [Mon, 9 Sep 2013 12:49:33 +0000 (16:49 +0400)]
Merge pull request #1412 from jet47:gpu-match-template-nocuda
Roman Donchenko [Mon, 9 Sep 2013 12:46:32 +0000 (16:46 +0400)]
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
Vadim Pisarevsky [Mon, 9 Sep 2013 12:13:39 +0000 (16:13 +0400)]
added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions.
Ilya Lavrenov [Mon, 9 Sep 2013 11:32:43 +0000 (15:32 +0400)]
fixed ocl::merge in case of 2 and types CV_32S and CV_32F
Roman Donchenko [Mon, 9 Sep 2013 11:03:40 +0000 (15:03 +0400)]
Merge pull request #1410 from SpecLad:module-samples
Roman Donchenko [Mon, 9 Sep 2013 11:03:07 +0000 (15:03 +0400)]
Merge pull request #1416 from asmorkalov:doc_hough_circle
Alexander Smorkalov [Mon, 9 Sep 2013 09:53:49 +0000 (13:53 +0400)]
Link to Hough Circle Transform sample fixed in tutorial.
Jin Ma [Mon, 9 Sep 2013 09:00:33 +0000 (17:00 +0800)]
Removed whitespace.
Roman Donchenko [Mon, 9 Sep 2013 08:54:32 +0000 (12:54 +0400)]
Merge pull request #1387 from vpisarev:ipp_imgwarp
Roman Donchenko [Mon, 9 Sep 2013 08:39:12 +0000 (12:39 +0400)]
Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp
Jin Ma [Mon, 9 Sep 2013 08:08:23 +0000 (16:08 +0800)]
Added Kalman Filter of OpenCL version.
Roman Donchenko [Mon, 9 Sep 2013 08:03:58 +0000 (12:03 +0400)]
Merge pull request #1409 from SpecLad:imgproc-test-memerr
Vladislav Vinogradov [Mon, 9 Sep 2013 06:51:44 +0000 (10:51 +0400)]
added missing gpu::matchTemplate implementation for non-CUDA build
Jin Ma [Sat, 7 Sep 2013 02:40:30 +0000 (10:40 +0800)]
Removed unnecessary process for conversion to 4-channel format.
Roman Donchenko [Fri, 6 Sep 2013 12:58:21 +0000 (16:58 +0400)]
Merge pull request #1407 from ilya-lavrenov:ocl_test_mog
Roman Donchenko [Fri, 6 Sep 2013 12:55:44 +0000 (16:55 +0400)]
Merge pull request #1406 from SpecLad:gpu-resize-warn