Alexander Alekhin
|
076eeffd4d
|
ocl: fix CL_RUNTIME_EXPORT for master branch
|
2013-10-08 19:13:58 +04:00 |
|
Roman Donchenko
|
f07769e9d8
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
|
2013-10-08 17:57:23 +04:00 |
|
Roman Donchenko
|
46eeb106e2
|
Merge pull request #1564 from alalek:cl_runtime_fix_32bit
|
2013-10-04 18:29:04 +04:00 |
|
Roman Donchenko
|
0a13510293
|
Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update
|
2013-10-04 18:25:44 +04:00 |
|
Roman Donchenko
|
2660f4bc59
|
Merge pull request #1562 from ilya-lavrenov:ocl_integral
|
2013-10-04 18:12:43 +04:00 |
|
Ilya Lavrenov
|
fb73e7b4bd
|
fixed pyrlk optical flow
|
2013-10-04 17:56:02 +04:00 |
|
Roman Donchenko
|
aa80250a3d
|
Merge pull request #1532 from alalek:stereo_csbp
|
2013-10-04 16:43:51 +04:00 |
|
Alexander Alekhin
|
90df620deb
|
ocl: stereo_csbp: divUp -> roundUp
|
2013-10-04 12:48:26 +04:00 |
|
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 |
|
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 |
|
Ilya Lavrenov
|
adca219f18
|
fixed convertC3C4 and convertC4C3 functions in case cols == 1
|
2013-10-03 10:45:15 +04:00 |
|
Andrey Pavlenko
|
73744904a2
|
Merge pull request #1542 from alalek:cl_runtime
|
2013-10-02 19:50:35 +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
|
a613a1a1da
|
fixed ocl::bitwise_not in case of CV_8UC1, CV_8UC2
|
2013-10-02 16:09:29 +04:00 |
|
Andrey Pavlenko
|
154fe4f657
|
Merge pull request #1519 from ilya-lavrenov:ocl_minMax
|
2013-10-01 20:16:48 +04:00 |
|
Roman Donchenko
|
81eb4bd8be
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
|
2013-10-01 15:57:33 +04:00 |
|
Ilya Lavrenov
|
065b40c6c3
|
fixed and extended ocl::norm
|
2013-10-01 13:21:43 +04:00 |
|
Ilya Lavrenov
|
a562b5c985
|
fixed ocl::meanStddev and created accuracy test for this function
|
2013-09-30 17:37:19 +04:00 |
|
Ilya Lavrenov
|
7379152afb
|
fixed ocl::setIdentity
|
2013-09-30 16:54:09 +04:00 |
|
Ilya Lavrenov
|
7edcefb2be
|
fixed ocl::phase
|
2013-09-30 16:02:14 +04:00 |
|
Ilya Lavrenov
|
b864f48274
|
fixed ocl::sum, ocl::sqrSum, ocl::absSum
|
2013-09-30 15:12:38 +04:00 |
|
peng xiao
|
422396ef6a
|
fix build error
|
2013-09-30 16:17:20 +08:00 |
|
peng xiao
|
f69ccfa43d
|
Add opencl svm.
|
2013-09-30 16:17:19 +08:00 |
|
Ilya Lavrenov
|
b54228fb83
|
fixed ocl::countNonZero
|
2013-09-27 17:35:06 +04:00 |
|
Ilya Lavrenov
|
9dca7555b4
|
fixed ocl::minMax
|
2013-09-27 16:25:10 +04:00 |
|
Andrey Pavlenko
|
3e91350a31
|
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
|
2013-09-26 15:50:54 +04:00 |
|
Ilya Lavrenov
|
f5af3ab851
|
changes in OpenCL matrix operations docs
|
2013-09-25 19:47:15 +04:00 |
|
Ilya Lavrenov
|
c8821bd909
|
replaced manually new/delete by AutoBuffer
|
2013-09-25 15:28:12 +04:00 |
|
Ilya Lavrenov
|
0faac595a8
|
fixed minMaxLoc kernel (removed compilation errors)
|
2013-09-25 15:14:10 +04:00 |
|
Ilya Lavrenov
|
544c02407e
|
reverted and generalized original ocl::transpose
|
2013-09-25 14:22:37 +04:00 |
|
Jin Ma
|
c7c0a41e17
|
Resolved the bug that the work group size is not valid.
|
2013-09-25 17:42:56 +08:00 |
|
Ilya Lavrenov
|
c87d2d414d
|
removed arithm_absdiff.cl
|
2013-09-24 14:18:42 +04:00 |
|
Ilya Lavrenov
|
8aa3eb817d
|
refactored arithm.cpp. Extended param list for all the tests
|
2013-09-24 14:13:10 +04:00 |
|
Ilya Lavrenov
|
b4ad128218
|
refactoed and extended ocl::transpose
|
2013-09-24 14:07:54 +04:00 |
|
Ilya Lavrenov
|
799afab23b
|
refactored and extended ocl::exp and ocl::log
|
2013-09-24 14:02:01 +04:00 |
|
Ilya Lavrenov
|
0730963576
|
refactored and extended ocl::compare
|
2013-09-24 13:58:18 +04:00 |
|
Ilya Lavrenov
|
8e0e352d77
|
refactored and extended binary bitwise operations
|
2013-09-24 13:54:46 +04:00 |
|
Ilya Lavrenov
|
161674bff2
|
refactored and extended ocl::addWeighted
|
2013-09-24 13:51:37 +04:00 |
|
Ilya Lavrenov
|
b20bd470fe
|
refactored and extended ocl::LUT
|
2013-09-24 13:49:38 +04:00 |
|
Ilya Lavrenov
|
311a7233c2
|
removed comments from filtering.cpp and imgproc.cpp in ocl module
|
2013-09-24 13:46:08 +04:00 |
|