Roman Donchenko
|
3f8db9d708
|
Merge pull request #1450 from adrians:neon-pull3
|
11 years ago |
Andrey Pavlenko
|
a239797271
|
Merge pull request #1611 from che-burashco:master
|
11 years ago |
Kyrylo Shegeda
|
d37d46d279
|
Fix a typo in kernel size
|
11 years ago |
Adrian Stratulat
|
3561bc1bbc
|
rename vBinOp64f to vBinOp64, minor fixups
|
11 years ago |
Adrian Stratulat
|
cb445d697c
|
Refactor vectorized arithmetical operations
|
11 years ago |
Roman Donchenko
|
3d4ec7ad98
|
Merge pull request #1583 from SpecLad:name-enum-2
|
11 years ago |
Roman Donchenko
|
dfb698dc64
|
Merge pull request #1581 from SpecLad:merge-2.4
|
11 years ago |
Alexander Alekhin
|
076eeffd4d
|
ocl: fix CL_RUNTIME_EXPORT for master branch
|
11 years ago |
Roman Donchenko
|
cc7a13ea57
|
Named GraphCutSeamFinderBase to allow its usage in makePtr.
Sequel to bcb6f038 .
|
11 years ago |
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
|
11 years ago |
Roman Donchenko
|
685eceb68a
|
Merge pull request #1567 from ilya-lavrenov:warn_fix
|
11 years ago |
Ilya Lavrenov
|
35d9ce0c0c
|
fixed warnings
|
11 years ago |
Roman Donchenko
|
b08233a3ca
|
Merge pull request #1569 from ilya-lavrenov:ocl_hough_circles
|
11 years ago |
Roman Donchenko
|
920e15b41d
|
Merge pull request #1572 from emchristiansen:includeLimits
|
11 years ago |
Roman Donchenko
|
f91f8663b6
|
Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk
|
11 years ago |
Roman Donchenko
|
801054d611
|
Merge pull request #1566 from SpecLad:Wshadow-openni
|
11 years ago |
emchristiansen
|
34f6b17c3f
|
Merge pull request #1 from ImAlsoGreg/master
add include limits, for compilers that dont add it implicitly
|
11 years ago |
Greg Hale
|
88b1847d09
|
add include limits, for compilers that dont add it implicitly
|
11 years ago |
Eric Martin Christiansen
|
c8a3a85e26
|
adds include to fix build
|
11 years ago |
Ilya Lavrenov
|
8c82decf5b
|
added plain branch to HoughCircle perf test
|
11 years ago |
Roman Donchenko
|
46eeb106e2
|
Merge pull request #1564 from alalek:cl_runtime_fix_32bit
|
11 years ago |
Roman Donchenko
|
0a13510293
|
Merge pull request #1557 from ilya-lavrenov:ocl_minor_doc_update
|
11 years ago |
Ilya Lavrenov
|
72c35d3a89
|
fixed mog2
|
11 years ago |
Roman Donchenko
|
df213241cc
|
Merge pull request #1560 from jet47:cmake-config-cuda-5.5-fix
|
11 years ago |
Roman Donchenko
|
744f4b1609
|
Merge pull request #1565 from SpecLad:cmake-new-ptr
|
11 years ago |
Roman Donchenko
|
2660f4bc59
|
Merge pull request #1562 from ilya-lavrenov:ocl_integral
|
11 years ago |
Ilya Lavrenov
|
fb73e7b4bd
|
fixed pyrlk optical flow
|
11 years ago |
Roman Donchenko
|
aa80250a3d
|
Merge pull request #1532 from alalek:stereo_csbp
|
11 years ago |
Roman Donchenko
|
cca2e5d8b1
|
Merge pull request #1536 from asmorkalov:android_ndk_r9_master
|
11 years ago |
Roman Donchenko
|
1b51270617
|
Merge pull request #1558 from SpecLad:Wparentheses-equality
|
11 years ago |
Roman Donchenko
|
f04cade607
|
Merge pull request #1559 from SpecLad:Wnull-conversion
|
11 years ago |
Vladislav Vinogradov
|
adc516becc
|
fixed OpenCVConfig.cmake.in file for CUDA 5.5 toolkit
|
11 years ago |
Roman Donchenko
|
3cfad385ec
|
Fix a -Wshadow warning in cap_openni.cpp.
|
11 years ago |
Roman Donchenko
|
ca65fe4548
|
Merge pull request #1535 from asmorkalov:android_ndk_r9
|
11 years ago |
Roman Donchenko
|
b03c19a8ac
|
Merge pull request #1554 from pablospe:fix_viz_module_compilation
|
11 years ago |
Roman Donchenko
|
61778a524f
|
Merge pull request #1563 from ilya-lavrenov:ocl_arithm
|
11 years ago |
Roman Donchenko
|
32630dbf61
|
Adapt cap_openni.cpp to the new Ptr.
|
11 years ago |
Roman Donchenko
|
ac36ae0498
|
Merge pull request #1553 from pablospe:doc_include_directories_cmake
|
11 years ago |
Alexander Alekhin
|
90df620deb
|
ocl: stereo_csbp: divUp -> roundUp
|
11 years ago |
Alexander Alekhin
|
2d1a6687f9
|
autogenerated code
|
11 years ago |
Alexander Alekhin
|
2fdfa37ea5
|
ocl: runtime, fix 32-bit builds
|
11 years ago |
Ilya Lavrenov
|
10d60f99dc
|
fixed ocl::integral and enabled perf test for it
|
11 years ago |
Ilya Lavrenov
|
5f81988699
|
refactored arithm binary operations in order to make them more scalable
|
11 years ago |
Andrey Pavlenko
|
8224f9843e
|
Merge pull request #1561 from alalek:ocl_refactoring
|
11 years ago |
Alexander Alekhin
|
d74ca7b39d
|
ocl: update module documentation
|
11 years ago |
Alexander Alekhin
|
69c2ef5ed2
|
ocl: update ocl samples
|
11 years ago |
Alexander Alekhin
|
7f0680fc8b
|
ocl: workaround for OpenCL C++ bindings usage: CL/cl.hpp
|
11 years ago |
Alexander Alekhin
|
8beb514ecf
|
ocl: merge with upstream/2.4
|
11 years ago |
Alexander Alekhin
|
16adbda4d3
|
ocl: added OpenCL device selection via OPENCV_OPENCL_DEVICE environment variable
|
11 years ago |
Alexander Alekhin
|
dd9ff587dc
|
ocl: file-based ProgramCache refactoring
|
11 years ago |