Andrey Pavlenko [Fri, 11 Oct 2013 08:37:41 +0000 (12:37 +0400)]
Merge pull request #1595 from alalek:cl_code_cleanup
Alexander Alekhin [Thu, 10 Oct 2013 21:16:12 +0000 (01:16 +0400)]
ocl: code cleanup, fix .clb files
Andrey Pavlenko [Thu, 10 Oct 2013 20:40:06 +0000 (00:40 +0400)]
Merge pull request #1598 from alalek:ocl_fix_build_mac
Andrey Pavlenko [Thu, 10 Oct 2013 20:38:12 +0000 (00:38 +0400)]
Merge pull request #1594 from ilya-lavrenov:ocl_perf
Alexander Alekhin [Thu, 10 Oct 2013 18:56:19 +0000 (22:56 +0400)]
ocl: fix build on Mac
Ilya Lavrenov [Wed, 9 Oct 2013 15:37:09 +0000 (19:37 +0400)]
added perf tests for min, max, abs
Andrey Pavlenko [Thu, 10 Oct 2013 15:02:29 +0000 (19:02 +0400)]
Merge pull request #1597 from alalek:ocl_fix_cleanup
Andrey Pavlenko [Thu, 10 Oct 2013 15:02:10 +0000 (19:02 +0400)]
Merge pull request #1596 from alalek:test_fix_run_py
Andrey Pavlenko [Thu, 10 Oct 2013 14:20:34 +0000 (18:20 +0400)]
Merge pull request #1551 from alalek:cmake_install_win
Alexander Alekhin [Sun, 6 Oct 2013 17:34:44 +0000 (21:34 +0400)]
test: run.py: return valid errorCode in case of the single test run
Alexander Alekhin [Sun, 6 Oct 2013 10:34:36 +0000 (14:34 +0400)]
ocl: fix cleanup on Windows platform (for clAmdBlas/clAmdFft)
Andrey Pavlenko [Thu, 10 Oct 2013 11:55:58 +0000 (15:55 +0400)]
Merge pull request #1592 from alalek:ocl_program_cache_update
Andrey Pavlenko [Thu, 10 Oct 2013 11:55:12 +0000 (15:55 +0400)]
Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h
Andrey Pavlenko [Thu, 10 Oct 2013 11:54:07 +0000 (15:54 +0400)]
Merge pull request #1593 from ilya-lavrenov:ocl_war_on_double
Ilya Lavrenov [Wed, 9 Oct 2013 14:05:09 +0000 (18:05 +0400)]
catching OpenCL double not supported exceptions
Alexander Alekhin [Wed, 9 Oct 2013 12:57:52 +0000 (16:57 +0400)]
ocl: fix compilation warnings, update openCLExecuteKernelInterop
Alexander Alekhin [Wed, 9 Oct 2013 15:17:20 +0000 (19:17 +0400)]
ocl: remove cl.hpp dependency (it is missed on Nvidia SDK and on some platforms)
Alexander Alekhin [Wed, 9 Oct 2013 14:29:03 +0000 (18:29 +0400)]
cmake: export OpenCVModules for unix 'install', move macros desclarations
Alexander Alekhin [Fri, 4 Oct 2013 13:48:43 +0000 (17:48 +0400)]
cmake: update java module install rules
Alexander Alekhin [Fri, 4 Oct 2013 13:15:02 +0000 (17:15 +0400)]
cmake: python module updates
Alexander Alekhin [Fri, 4 Oct 2013 13:04:10 +0000 (17:04 +0400)]
cmake: update install rules for doc
Alexander Alekhin [Thu, 3 Oct 2013 15:27:57 +0000 (19:27 +0400)]
cmake: OpenCVConfig.cmake: fix message
Alexander Alekhin [Thu, 3 Oct 2013 14:48:07 +0000 (18:48 +0400)]
cmake: revert CRT linkage option for MSVS
Alexander Alekhin [Wed, 2 Oct 2013 22:20:54 +0000 (02:20 +0400)]
cmake: workaround for dependencies resolver (bypass non-module deps w/o check)
ilya-lavrenov [Wed, 4 Sep 2013 14:32:05 +0000 (18:32 +0400)]
fixed warning on windows
Alexander Alekhin [Wed, 7 Aug 2013 08:53:48 +0000 (12:53 +0400)]
update cmake 'install' target for Windows platform
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
Andrey Pavlenko [Wed, 9 Oct 2013 12:47:59 +0000 (16:47 +0400)]
Merge pull request #1589 from ilya-lavrenov:pr1582_fix
Ilya Lavrenov [Wed, 9 Oct 2013 10:18:07 +0000 (14:18 +0400)]
changes eps for NORM_L1
Ilya Lavrenov [Wed, 9 Oct 2013 10:07:24 +0000 (14:07 +0400)]
fixed the PR 1582
Andrey Pavlenko [Wed, 9 Oct 2013 09:52:20 +0000 (13:52 +0400)]
Merge pull request #1579 from ilya-lavrenov:ocl_norm
Andrey Pavlenko [Wed, 9 Oct 2013 09:49:34 +0000 (13:49 +0400)]
Merge pull request #1586 from ilya-lavrenov:ocl_setto_win_fix
Roman Donchenko [Wed, 9 Oct 2013 08:36:01 +0000 (12:36 +0400)]
Merge pull request #1582 from sperrholz:ocl-arithm-additions
Ilya Lavrenov [Tue, 8 Oct 2013 14:25:40 +0000 (18:25 +0400)]
ocl setto fix for windows
Ilya Lavrenov [Tue, 8 Oct 2013 14:25:40 +0000 (18:25 +0400)]
ocl setto fix for windows
Sebastian Krämer [Tue, 8 Oct 2013 14:49:20 +0000 (16:49 +0200)]
fix documentation warning
Ilya Lavrenov [Tue, 8 Oct 2013 12:02:47 +0000 (16:02 +0400)]
fixed ocl::norm (previously the function used double as a work type)
Sebastian Krämer [Tue, 8 Oct 2013 13:16:30 +0000 (15:16 +0200)]
add ocl::abs
Sebastian Krämer [Mon, 7 Oct 2013 13:51:01 +0000 (15:51 +0200)]
documentation update for ocl::min and ocl::max
Sebastian Krämer [Mon, 7 Oct 2013 13:41:50 +0000 (15:41 +0200)]
add ocl::min and ocl::max (includes accuracy tests update)
Roman Donchenko [Tue, 8 Oct 2013 11:31:42 +0000 (15:31 +0400)]
Merge pull request #1574 from alalek:svm_workaround
Roman Donchenko [Tue, 8 Oct 2013 11:14:38 +0000 (15:14 +0400)]
Merge pull request #1577 from ilya-lavrenov:ocl_setto_opencl12
Roman Donchenko [Tue, 8 Oct 2013 10:20:11 +0000 (14:20 +0400)]
Merge pull request #1576 from alalek:ocl_fix_cl_double
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
Ilya Lavrenov [Mon, 7 Oct 2013 18:10:11 +0000 (22:10 +0400)]
enabled OpenCL 1.2 branch in oclMat::setTo
Roman Donchenko [Tue, 8 Oct 2013 08:32:57 +0000 (12:32 +0400)]
Merge pull request #1570 from ilya-lavrenov:ipp_warn_fix
Alexander Alekhin [Mon, 7 Oct 2013 17:01:33 +0000 (21:01 +0400)]
ocl: fix Context::CL_* usage
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.
Alexander Alekhin [Mon, 7 Oct 2013 12:08:05 +0000 (16:08 +0400)]
svm: disable failed tests
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
projects / profile / ivi / opencv.git / log