Peng Xiao
7a2a810de5
Update retina_ocl.cpp
11 years ago
Roman Donchenko
8b19df3fec
Merge pull request #1748 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
65389e41db
Revert commit 994e07db0
(PR #1715 ), because it's irrelevant for master.
...
Conflicts:
modules/java/generator/src/cpp/VideoCapture.cpp
11 years ago
abidrahmank
8bba305487
small correction in Py tutorials
11 years ago
peng xiao
53d1873776
Revert back test image.
11 years ago
Alexander Alekhin
3952a0df44
ocl: update comments in ocl.hpp
11 years ago
Alexander Alekhin
5a333bfff4
ocl: update documentation
11 years ago
Andrey Pavlenko
be37d99567
Merge pull request #1752 from alalek:ocl_memory_cleanup_workaround
11 years ago
Andrey Pavlenko
14c3560750
Merge pull request #1751 from ilya-lavrenov:ocl_copyMakeBorder_test_fix
11 years ago
Andrey Pavlenko
14b2eed17b
Merge pull request #1745 from alalek:ocl_fix_svm_with_blas
11 years ago
Alexander Alekhin
691d5f4187
ocl: memory cleanup workaround: clFinish() before clReleaseMemObject() + 64kb memory guard
11 years ago
Roman Donchenko
f2241e3d26
Merge pull request #1749 from SpecLad:update-ignore
11 years ago
Ilya Lavrenov
e544e34eed
fixed ocl::copyMakeBorder accuracy test
11 years ago
Roman Donchenko
8f5eaca354
Remove the explicit setting of CMP0017, partially undoing #1720 .
...
In master, it's already set to NEW, since we declare the minimal CMake
version as 2.8.7, which is newer than the policy.
11 years ago
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
11 years ago
Alexander Alekhin
7704dbf866
ocl: svm: restore non BLAS version
11 years ago
Alexander Alekhin
9a63508f50
Revert "disable SVM when AMD BLAS is not available"
...
This reverts commit d63a38e9bf
.
Conflicts:
modules/ocl/test/test_ml.cpp
11 years ago
Vincent Rabaud
0b1df62215
add VERBATIM as advised by @SpecLad
11 years ago
Vincent Rabaud
3b0108e4c1
fix the crash as suggested by @SpecLad
11 years ago
Ilya Lavrenov
e7e7e04dce
came back to relative error
11 years ago
Roman Donchenko
4203979c87
Sorted .gitignore.
11 years ago
Roman Donchenko
ec77434190
Update .gitignore.
...
* OpenCV4Tegra/ is no longer relevant.
* We should only ignore the particular refman.rst that we generate.
11 years ago
Ilya Lavrenov
2df53d97c5
added ocl::repeat
11 years ago
peng xiao
8adebcbc00
Add ocl retina sample.
11 years ago
peng xiao
2a111f7a6c
Let perf/accuracy test of ocl haar uses detectMultiScale api.
...
Fix image to be used by perf test.
11 years ago
Ilya Lavrenov
c89dfd333c
fixed warnings in OpenCL kernels
11 years ago
Ilya Lavrenov
a8426e1c12
fixed ocl::cornerHarris, ocl::cornerMinEigenVal and their accuracy tests
11 years ago
peng xiao
8c1eb5bf0e
Overload detectMultiScale API for ocl::haar.
11 years ago
Vincent Rabaud
e1b2f593d6
fix crash when path has spaces
...
The paths are defined properly with an escape "\ " but you cannot have an escape and
quotes when piping (otherwise, escapes are understood as 2 characters).
So just remove the quotes.
11 years ago
Andrey Pavlenko
dd942df08b
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access
11 years ago
Andrey Pavlenko
2767be9a5e
Merge pull request #1731 from perping:2.4_haar
11 years ago
Roman Donchenko
9d263db8aa
Merge pull request #1734 from asmorkalov:android_manager_version_inc
11 years ago
Alexander Alekhin
99ae9d9cc1
ocl: corner*: fix memory access in kernels; change error check to relative
11 years ago
Andrey Pavlenko
6c21b85fce
Merge pull request #1733 from ilya-lavrenov:cv_remap
11 years ago
Andrey Pavlenko
ba5dac2edb
Merge pull request #1732 from alalek:ocl_blendLinear
11 years ago
Alexander Smorkalov
f027cf80f7
OpenCV Version++. OpenCV Manager Version++.
11 years ago
Ilya Lavrenov
5546f4d77f
consistency SSE2 and plain versions of convertMaps and remap
11 years ago
Alexander Alekhin
3b293d6855
ocl: fix testdata for blendLinear
11 years ago
perping
af77111cd6
remove whitespace.
11 years ago
Roman Donchenko
e7e6d9d63c
Merge pull request #1729 from ilya-lavrenov:ocl_moments
11 years ago
Roman Donchenko
a9a39a3aa2
Merge pull request #1730 from ilya-lavrenov:ocl_kern_warn
11 years ago
Roman Donchenko
b1bed14ebc
Merge pull request #1728 from apavlenko:refactor_vcap_jni
11 years ago
perping
af33c118b4
fixed a bug of haar.
11 years ago
Ilya Lavrenov
a8b7573db0
fixed ocl::Moments test
11 years ago
Ilya Lavrenov
1f9ab2e0ca
fixed warnings in ocl kernels
11 years ago
Andrey Pavlenko
dfa5a27bee
Merge pull request #1727 from ilya-lavrenov:ocl_warpPerspective
11 years ago
Andrey Pavlenko
fbabc323ed
Merge pull request #1726 from melody-rain:2.4_tvl1_ocl
11 years ago
Andrey Pavlenko
bf58049d11
Merge pull request #1724 from ilya-lavrenov:ocl_thresh
11 years ago
Andrey Pavlenko
e80f5bed2d
Merge pull request #1710 from melody-rain:2.4_moments_ocl
11 years ago
Ilya Lavrenov
c8aed4996e
fixed ocl::warpPerspective
11 years ago