Alexander Alekhin
2d1a6687f9
autogenerated code
2013-10-04 12:40:08 +04:00
Alexander Alekhin
2fdfa37ea5
ocl: runtime, fix 32-bit builds
2013-10-04 12:40:08 +04:00
Ilya Lavrenov
10d60f99dc
fixed ocl::integral and enabled perf test for it
2013-10-04 12:33:14 +04:00
Ilya Lavrenov
5f81988699
refactored arithm binary operations in order to make them more scalable
2013-10-04 12:13:22 +04:00
Andrey Pavlenko
8224f9843e
Merge pull request #1561 from alalek:ocl_refactoring
2013-10-04 11:50:03 +04:00
Alexander Alekhin
d74ca7b39d
ocl: update module documentation
2013-10-03 23:26:06 +04:00
Alexander Alekhin
69c2ef5ed2
ocl: update ocl samples
2013-10-03 23:26:06 +04:00
Alexander Alekhin
7f0680fc8b
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
2013-10-03 23:26:06 +04:00
Alexander Alekhin
8beb514ecf
ocl: merge with upstream/2.4
2013-10-03 23:26:06 +04:00
Alexander Alekhin
16adbda4d3
ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable
2013-10-03 19:50:14 +04:00
Alexander Alekhin
dd9ff587dc
ocl: file-based ProgramCache refactoring
2013-10-03 19:50:14 +04:00
Alexander Alekhin
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
2013-10-03 19:50:14 +04:00
Alexander Alekhin
e8d9ed8955
ocl: split initialization.cpp into 3 files: context, operations, programcache
2013-10-03 19:50:14 +04:00
Ilya Lavrenov
dafd4da031
removed ocl::minMax_buf, updated doc (operation on matrices)
2013-10-03 18:19:15 +04:00
Roman Donchenko
8e75947a7d
Merge pull request #1555 from ilya-lavrenov:ocl_convertC3C4
2013-10-03 16:52:10 +04:00
Roman Donchenko
1817a07a5e
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
2013-10-03 12:11:50 +04:00
Roman Donchenko
fa9d092c43
Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp.
2013-10-03 12:04:57 +04:00
Roman Donchenko
a1e239d2bf
Merge pull request #1527 from vpisarev:shape_module
2013-10-03 11:54:41 +04:00
Alexander Smorkalov
1aaeb52a4c
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:36:12 +04:00
Alexander Smorkalov
ccb48ddee0
Android NDK r9 support. x64 NDK support fix for MacOS X.
2013-10-03 11:23:50 +04:00
Ilya Lavrenov
adca219f18
fixed convertC3C4 and convertC4C3 functions in case cols == 1
2013-10-03 10:45:15 +04:00
Vladislav Vinogradov
4e4d2da0b9
fix #3296 : Unsupported gpu architecture 'compute_21'
2013-10-03 10:21:00 +04:00
Pablo Speciale
f47afe5799
Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)
2013-10-03 02:10:27 +02:00
Pablo Speciale
169ebae8c0
After commit c7bbd1a, 'include_directories()' is needed in the CMakeLists.txt (user side). This commit updates the documentation.
2013-10-03 00:43:12 +02:00
Andrey Pavlenko
88419f8923
Merge pull request #1507 from pengx17:2.4_fix_test
2013-10-02 19:52:12 +04:00
Andrey Pavlenko
73744904a2
Merge pull request #1542 from alalek:cl_runtime
2013-10-02 19:50:35 +04:00
Alexander Alekhin
12eb340a4e
removed invalid comment
2013-10-02 19:35:21 +04:00
Roman Donchenko
447e03bc28
Merge pull request #1543 from SpecLad:name-enum
2013-10-02 19:22:35 +04:00
Andrey Pavlenko
b396916cdb
Merge pull request #1549 from ilya-lavrenov:ocl_perf_norm
2013-10-02 19:14:16 +04:00
Andrey Pavlenko
b2fe053f4d
Merge pull request #1548 from ilya-lavrenov:ocl_bitwise_not
2013-10-02 19:14:00 +04:00
Roman Donchenko
e389111b5b
Merge pull request #1550 from SpecLad:flann-uninit-master
2013-10-02 18:52:38 +04:00
Alexander Alekhin
5ab49c4cc2
ocl: cl_runtime: added autogenerated code
2013-10-02 18:32:33 +04:00
Alexander Alekhin
212ad97100
ocl: dynamic load of OpenCL libraries
...
Support functions from OpenCL 1.1 / OpenCL 1.2
2013-10-02 18:32:33 +04:00
Ilya Lavrenov
e8b93040d6
enabled ocl::norm perf test
2013-10-02 16:57:15 +04:00
Roman Donchenko
d019344c9d
Merge pull request #1547 from SpecLad:gtest-1.7
2013-10-02 16:46:19 +04:00
Roman Donchenko
58da54cb7a
Cherry-picked mariusmuja/flann@8c8b0e0cb8 .
...
Original author: me.
2013-10-02 16:09:45 +04:00
Ilya Lavrenov
a613a1a1da
fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2
2013-10-02 16:09:29 +04:00
Roman Donchenko
4c19e0273a
Cherry-picked mariusmuja/flann@b615f26947 .
...
Original author: Alex Wilson.
2013-10-02 16:06:56 +04:00
Roman Donchenko
78c4ffec99
Revert "Fixed a bug in FLANN resulting in uninitialized accesses."
...
This reverts commit a9975b144a
2013-10-02 16:02:11 +04:00
Roman Donchenko
60bcc52c4f
Merge pull request #1541 from SpecLad:merge-2.4
2013-10-02 14:47:30 +04:00
Roman Donchenko
e65eb4e042
Updated Google Test to 1.7.0.
2013-10-02 14:41:00 +04:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
4c7ecf20d8
Merge pull request #1529 from vpisarev:polyfit_accuracy_2
2013-10-02 12:52:33 +04:00
Roman Donchenko
a71a891b93
Merge pull request #1451 from adrians:neon-pull2
2013-10-02 12:51:30 +04:00
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
Andrey Pavlenko
75d89f4331
Merge pull request #1533 from alalek:perf_test_update_relative_error_message
2013-10-01 20:17:52 +04:00
Andrey Pavlenko
154fe4f657
Merge pull request #1519 from ilya-lavrenov:ocl_minMax
2013-10-01 20:16:48 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
Roman Donchenko
8c15d27619
Merge pull request #1525 from asmorkalov:ocv_custom_libv4l
2013-10-01 19:40:12 +04:00
Roman Donchenko
bcb6f0386e
Named FastFeatureDetector::Type to allow its use in makePtr.
...
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278 >.
2013-10-01 18:22:03 +04:00
