Roman Donchenko [Tue, 8 Oct 2013 09:00:38 +0000 (13:00 +0400)]
Merge pull request #1538 from StevenPuttemans:bugfix_3283
Roman Donchenko [Tue, 8 Oct 2013 08:59:49 +0000 (12:59 +0400)]
Merge pull request #1545 from alalek:ocl_test_fix_rng
Roman Donchenko [Tue, 8 Oct 2013 08:32:57 +0000 (12:32 +0400)]
Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix
Roman Donchenko [Tue, 8 Oct 2013 08:22:14 +0000 (12:22 +0400)]
Merge pull request #1578 from asmorkalov:android_fd_cp_fix
Alexander Smorkalov [Tue, 8 Oct 2013 06:28:24 +0000 (10:28 +0400)]
Invalid copy-passed exception messages in FaceDetect sample for Android fixed.
Roman Donchenko [Mon, 7 Oct 2013 11:48:39 +0000 (15:48 +0400)]
Merge pull request #1566 from SpecLad:Wshadow-openni
Ilya Lavrenov [Sat, 5 Oct 2013 10:35:31 +0000 (14:35 +0400)]
fixed ipp-related warnings
Roman Donchenko [Fri, 4 Oct 2013 14:29:03 +0000 (18:29 +0400)]
Merge pull request #1564 from alalek:cl_runtime_fix_32bit
Roman Donchenko [Fri, 4 Oct 2013 14:25:44 +0000 (18:25 +0400)]
Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update
Roman Donchenko [Fri, 4 Oct 2013 14:15:05 +0000 (18:15 +0400)]
Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix
Roman Donchenko [Fri, 4 Oct 2013 14:12:42 +0000 (18:12 +0400)]
Merge pull request #1562 from ilya-lavrenov:ocl_integral
Roman Donchenko [Fri, 4 Oct 2013 12:43:51 +0000 (16:43 +0400)]
Merge pull request #1532 from alalek:stereo_csbp
Roman Donchenko [Fri, 4 Oct 2013 12:32:08 +0000 (16:32 +0400)]
Merge pull request #1558 from SpecLad:Wparentheses-equality
Alexander Alekhin [Wed, 2 Oct 2013 16:18:48 +0000 (20:18 +0400)]
ocl: tests: RNG usage refactoring
Vladislav Vinogradov [Fri, 4 Oct 2013 11:14:21 +0000 (15:14 +0400)]
fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit
Roman Donchenko [Fri, 4 Oct 2013 10:23:06 +0000 (14:23 +0400)]
Fix a -Wshadow warning in cap_openni.cpp.
Roman Donchenko [Fri, 4 Oct 2013 10:14:20 +0000 (14:14 +0400)]
Merge pull request #1535 from asmorkalov:android_ndk_r9
Roman Donchenko [Fri, 4 Oct 2013 09:59:19 +0000 (13:59 +0400)]
Merge pull request #1563 from ilya-lavrenov:ocl_arithm
StevenPuttemans [Tue, 1 Oct 2013 09:37:14 +0000 (11:37 +0200)]
Fix of bug #3283 and bug #3301
Added extra information for fitEllipse, minAreaRect and addapted ellipse &
ellipse2Poly parameter description.
Alexander Alekhin [Mon, 30 Sep 2013 16:33:56 +0000 (20:33 +0400)]
ocl: stereo_csbp: divUp -> roundUp
Alexander Alekhin [Thu, 3 Oct 2013 18:57:39 +0000 (22:57 +0400)]
autogenerated code
Alexander Alekhin [Thu, 3 Oct 2013 18:57:05 +0000 (22:57 +0400)]
ocl: runtime, fix 32-bit builds
Ilya Lavrenov [Thu, 3 Oct 2013 15:17:54 +0000 (19:17 +0400)]
fixed ocl::integral and enabled perf test for it
Ilya Lavrenov [Thu, 3 Oct 2013 16:04:04 +0000 (20:04 +0400)]
refactored arithm binary operations in order to make them more scalable
Andrey Pavlenko [Fri, 4 Oct 2013 07:50:03 +0000 (11:50 +0400)]
Merge pull request #1561 from alalek:ocl_refactoring
Alexander Alekhin [Thu, 3 Oct 2013 16:00:41 +0000 (20:00 +0400)]
ocl: update module documentation
Alexander Alekhin [Thu, 3 Oct 2013 15:35:01 +0000 (19:35 +0400)]
ocl: update ocl samples
Alexander Alekhin [Thu, 3 Oct 2013 13:05:00 +0000 (17:05 +0400)]
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
Alexander Alekhin [Mon, 30 Sep 2013 17:32:46 +0000 (21:32 +0400)]
ocl: merge with upstream/2.4
Alexander Alekhin [Mon, 30 Sep 2013 15:07:37 +0000 (19:07 +0400)]
ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable
Alexander Alekhin [Wed, 25 Sep 2013 15:07:14 +0000 (19:07 +0400)]
ocl: file-based ProgramCache refactoring
Alexander Alekhin [Fri, 27 Sep 2013 12:41:25 +0000 (16:41 +0400)]
ocl: move program names into opencl_kernels.hpp
Alexander Alekhin [Fri, 20 Sep 2013 15:19:52 +0000 (19:19 +0400)]
ocl: split initialization.cpp into 3 files: context, operations, programcache
Ilya Lavrenov [Thu, 3 Oct 2013 07:36:49 +0000 (11:36 +0400)]
removed ocl::minMax_buf, updated doc (operation on matrices)
Roman Donchenko [Thu, 3 Oct 2013 12:52:10 +0000 (16:52 +0400)]
Merge pull request #1555 from ilya-lavrenov:ocl_convertC3C4
Roman Donchenko [Thu, 3 Oct 2013 08:04:57 +0000 (12:04 +0400)]
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
Alexander Smorkalov [Tue, 1 Oct 2013 08:47:03 +0000 (12:47 +0400)]
Android NDK r9 support. x64 NDK support fix for MacOS X.
Ilya Lavrenov [Wed, 2 Oct 2013 19:21:28 +0000 (23:21 +0400)]
fixed convertC3C4 and convertC4C3 functions in case cols == 1
Andrey Pavlenko [Wed, 2 Oct 2013 15:52:12 +0000 (19:52 +0400)]
Merge pull request #1507 from pengx17:2.4_fix_test
Andrey Pavlenko [Wed, 2 Oct 2013 15:50:34 +0000 (19:50 +0400)]
Merge pull request #1542 from alalek:cl_runtime
Alexander Alekhin [Wed, 2 Oct 2013 15:35:21 +0000 (19:35 +0400)]
removed invalid comment
Andrey Pavlenko [Wed, 2 Oct 2013 15:14:15 +0000 (19:14 +0400)]
Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm
Andrey Pavlenko [Wed, 2 Oct 2013 15:13:59 +0000 (19:13 +0400)]
Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not
Alexander Alekhin [Sat, 14 Sep 2013 23:06:47 +0000 (03:06 +0400)]
ocl: cl_runtime: added autogenerated code
Alexander Alekhin [Sat, 14 Sep 2013 22:45:02 +0000 (02:45 +0400)]
ocl: dynamic load of OpenCL libraries
Support functions from OpenCL 1.1 / OpenCL 1.2
Ilya Lavrenov [Wed, 2 Oct 2013 12:39:05 +0000 (16:39 +0400)]
enabled ocl::norm perf test
Roman Donchenko [Wed, 2 Oct 2013 12:46:18 +0000 (16:46 +0400)]
Merge pull request #1547 from SpecLad:gtest-1.7
Ilya Lavrenov [Wed, 2 Oct 2013 12:06:15 +0000 (16:06 +0400)]
fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2
Roman Donchenko [Wed, 2 Oct 2013 10:41:00 +0000 (14:41 +0400)]
Updated Google Test to 1.7.0.
Andrey Pavlenko [Tue, 1 Oct 2013 16:17:52 +0000 (20:17 +0400)]
Merge pull request #1533 from alalek:perf_test_update_relative_error_message
Andrey Pavlenko [Tue, 1 Oct 2013 16:16:47 +0000 (20:16 +0400)]
Merge pull request #1519 from ilya-lavrenov:ocl_minMax
Roman Donchenko [Tue, 1 Oct 2013 15:40:12 +0000 (19:40 +0400)]
Merge pull request #1525 from asmorkalov:ocv_custom_libv4l
Ilya Lavrenov [Tue, 1 Oct 2013 13:53:14 +0000 (17:53 +0400)]
removed test_norm.cpp from ocl tests
Roman Donchenko [Tue, 1 Oct 2013 13:39:18 +0000 (17:39 +0400)]
Merge pull request #1530 from alalek:perf_tests_sanity_check_nothing
Alexander Alekhin [Mon, 30 Sep 2013 12:08:08 +0000 (16:08 +0400)]
ocl: perf test: disable MOG2 (random hungs), enable upload/download
Alexander Alekhin [Mon, 30 Sep 2013 12:07:50 +0000 (16:07 +0400)]
perf tests: added SANITY_CHECK_NOTHING()
Ilya Lavrenov [Mon, 30 Sep 2013 14:58:32 +0000 (18:58 +0400)]
fixed and extended ocl::norm
Alexander Alekhin [Sun, 29 Sep 2013 02:35:12 +0000 (06:35 +0400)]
perf test: update error message about relative error
Roman Donchenko [Mon, 30 Sep 2013 13:50:29 +0000 (17:50 +0400)]
Merge pull request #1457 from pengx17:2.4_oclsvm
Ilya Lavrenov [Mon, 30 Sep 2013 13:36:59 +0000 (17:36 +0400)]
fixed ocl::meanStddev and created accuracy test for this function
Roman Donchenko [Mon, 30 Sep 2013 13:37:18 +0000 (17:37 +0400)]
Merge pull request #1509 from perping:2.4_docs
Ilya Lavrenov [Mon, 30 Sep 2013 12:54:09 +0000 (16:54 +0400)]
fixed ocl::setIdentity
Roman Donchenko [Mon, 30 Sep 2013 12:21:51 +0000 (16:21 +0400)]
Merge pull request #1518 from jet47:bug-3291-tbb-install
Roman Donchenko [Mon, 30 Sep 2013 12:04:58 +0000 (16:04 +0400)]
Merge pull request #1522 from nghiaho12:latentsvm
Ilya Lavrenov [Mon, 30 Sep 2013 11:08:26 +0000 (15:08 +0400)]
fixed ocl::phase
Ilya Lavrenov [Fri, 27 Sep 2013 13:56:30 +0000 (17:56 +0400)]
fixed ocl::sum, ocl::sqrSum, ocl::absSum
Alexander Smorkalov [Mon, 30 Sep 2013 08:44:59 +0000 (12:44 +0400)]
Make libv4l support optional for testing purposes.
peng xiao [Tue, 17 Sep 2013 00:50:13 +0000 (08:50 +0800)]
Fix new blank line at EOF.
peng xiao [Mon, 16 Sep 2013 05:52:56 +0000 (13:52 +0800)]
fix build error
peng xiao [Mon, 16 Sep 2013 03:23:53 +0000 (11:23 +0800)]
Add opencl svm.
Nghia Ho [Sat, 28 Sep 2013 11:46:48 +0000 (21:46 +1000)]
Missing closedir with opendir
Ilya Lavrenov [Fri, 27 Sep 2013 13:32:31 +0000 (17:32 +0400)]
fixed ocl::countNonZero
Ilya Lavrenov [Fri, 27 Sep 2013 11:53:47 +0000 (15:53 +0400)]
fixed ocl::minMax
Vladislav Vinogradov [Fri, 27 Sep 2013 10:44:58 +0000 (14:44 +0400)]
fix for bug #3291:
add INSTALL command for TBB target
Alexander Smorkalov [Fri, 27 Sep 2013 09:25:53 +0000 (13:25 +0400)]
Merge pull request #1515 from asmorkalov:ocv_pr_1464_revert
Alexander Smorkalov [Fri, 27 Sep 2013 08:17:55 +0000 (12:17 +0400)]
pr #1464 reverted as breaking the build for Linux without libv4l library.
perping [Fri, 27 Sep 2013 01:50:37 +0000 (09:50 +0800)]
fix warning about addWeighted and remove magnitudeSqr().
Alexander Smorkalov [Thu, 26 Sep 2013 17:09:41 +0000 (21:09 +0400)]
Merge pull request #1511 from apavlenko:shorten_hdr
Andrey Pavlenko [Thu, 26 Sep 2013 13:06:06 +0000 (17:06 +0400)]
hortening the file names (HighDynamicRange -> HDR)
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
perping [Thu, 26 Sep 2013 07:30:44 +0000 (15:30 +0800)]
fix three warning about mog, mog2 and KNearestNeighbour.
perping [Thu, 26 Sep 2013 06:04:11 +0000 (14:04 +0800)]
Update the OpenCL documents.
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
peng xiao [Thu, 26 Sep 2013 04:59:21 +0000 (12:59 +0800)]
If device does not support double, returns immediately.
Double floating points are not default supported by OpenCL.
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