Roman Donchenko
5237647f75
Merge pull request #944 from jet47:cmake-2.8.11-cuda-fix
2013-06-03 16:08:06 +04:00
Vladislav Vinogradov
bcf8bdb401
fixed constructors for functional objects (added __host__ modifier)
2013-06-03 14:41:23 +04:00
Vladislav Vinogradov
ff28bf831f
disabled samples with driver api
2013-06-03 14:01:04 +04:00
Vladislav Vinogradov
58e472754a
fixed norm diff function (it uses pre-allocated buffer now)
2013-06-03 13:37:44 +04:00
Vladislav Vinogradov
0521e8908c
fixed NPP error constants usage
2013-06-03 13:37:36 +04:00
Vladislav Vinogradov
09a7e86a39
fixed NPP library search (it was splitted)
2013-06-03 13:37:30 +04:00
Vladislav Vinogradov
013581f371
fixed GPU module compialtion with CMake 2.8.11
...
CMake 2.8.11 removed linkage with CUDA driver library,
but it's used by gpu video encoding/decoding
2013-06-03 13:29:26 +04:00
Roman Donchenko
e9c298b784
Merge pull request #912 from SpecLad:contributing
2013-06-03 12:13:45 +04:00
Roman Donchenko
34c5f47f60
Merge pull request #934 from SpecLad:parallel-for
2013-06-03 12:13:16 +04:00
Andrey Pavlenko
081c47e3df
making the comment less ambigous
2013-05-31 19:55:51 +04:00
Andrey Pavlenko
6f006e50dc
setting 'char' to be signed by default since some tests fail when it's wrong (e.g. native compilation on ARM Linux)
2013-05-31 18:58:30 +04:00
Roman Donchenko
8a4090fe3f
Make AutoLock noncopyable (it would break on copying, anyway).
2013-05-31 17:27:42 +04:00
Roman Donchenko
85360572b0
Merge pull request #931 from jet47:gpu-test-fixes
2013-05-31 16:46:31 +04:00
peng xiao
cdb16f1120
Fix build error
2013-05-31 17:29:55 +08:00
peng xiao
97b86aa259
Initialize OpenCL context at the end of getDevice call.
...
Added for better compatibility with the current samples/test cases.
User now will be able to initialize OpenCL context explicitly with
ocl::getDevice api.
This may be obsoleted in future releases.
2013-05-31 16:48:40 +08:00
Roman Donchenko
f90fd5b0da
Split CLAHE into its own file, because it's faster that way.
...
Yes, it's as ludicrous as it sounds, but it's still true. Bizarrely,
the previous commit makes CLAHE run about 10% slower on Android, even
though it doesn't even touch any CLAHE code. Splitting it off fixes that,
although the reason it does is a mystery for the ages.
It's cleaner when it's in its own file, anyway. ;=]
2013-05-31 12:22:04 +04:00
Roman Donchenko
29b13ec1de
Replaced most of the usages of parallel_for with that of parallel_for_.
...
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
peng xiao
d85f27b537
Update ocl::surf_matcher sample.
...
The new sample adjust some parameters thus it should always be able to
calculate valid homography matrix when input is box.png and
box_in_scene.png.
Pure cpp surf and bfmatcher implementation is also added to show the user
its accuracy and performance.
2013-05-31 16:06:56 +08:00
yao
15a213d3fc
fix a crash on Linux
2013-05-31 15:35:54 +08:00
yao
abefcc6061
Adjust perf_filters, as this function only supports 3x3 kernel
2013-05-31 15:16:03 +08:00
peng xiao
b1c248fcc9
Fix ocl::filter2D.
...
In current implementation, this function only works when anchor point is
in the kernel center and kernel size supported is either 3x3 or 5x5.
2013-05-31 10:53:52 +08:00
peng xiao
fdc133d8c9
Fix ocl::pyrup kernel build on Mac.
2013-05-30 16:34:20 +08:00
Vadim Pisarevsky
37091b086c
Merge pull request #932 from bitwangyaoyao:2.4_fixBFM
2013-05-30 12:21:27 +04:00
yao
5b598f8a0e
a few fixes of ocl::perf test cases
2013-05-30 16:20:31 +08:00
Vadim Pisarevsky
6bb9342a5f
Merge pull request #918 from bitwangyaoyao:2.4_samples
2013-05-30 12:01:40 +04:00
Vadim Pisarevsky
5a4efe8bcf
Merge pull request #924 from pengx17:2.4_arithm_fix
2013-05-30 12:01:25 +04:00
Vadim Pisarevsky
678371be39
Merge pull request #925 from pengx17:2.4_canny_tmp_fix
2013-05-30 12:01:09 +04:00
Vadim Pisarevsky
c176131a67
Merge pull request #927 from bitwangyaoyao:2.4_perf
2013-05-30 12:00:47 +04:00
Roman Donchenko
c3f5e73769
Merge pull request #930 from pengx17:2.4_haar_ext
2013-05-30 11:57:24 +04:00
yao
7ed9c0e87a
Fix brute_force_matcher's hung on some Intel CPU OCL
2013-05-30 14:57:15 +08:00
peng xiao
fd7ba355ee
Add non-stump based ocl Haar cascade classifier support.
...
For example, haarcascade_frontalface_alt2.xml is now supported.
Note that classifier's pattern of a cascade file must be consistent,
i.e., all trees must either have two nodes or one node, otherwise
unexpected results will occur.
Other fixes:
Test cases are updated.
Some unused codes are removed.
Fix some problems of haar when using OclCascadeClassifierBuf.
2013-05-30 14:01:19 +08:00
Vladislav Vinogradov
6b1c28ce6d
fixed some gpu tests (different rounding results due to float arithmetics)
2013-05-29 17:38:32 +04:00
Roman Donchenko
0ae40507e5
Merge pull request #928 from apavlenko:bugfix_3027
2013-05-29 17:10:48 +04:00
Roman Donchenko
fbb25787cd
Merge pull request #920 from asmorkalov:android_move
2013-05-29 16:53:04 +04:00
Roman Donchenko
d81d3fc830
Merge pull request #921 from SpecLad:merge-2.4
2013-05-29 16:24:49 +04:00
Roman Donchenko
b890274738
Merge pull request #910 from pengx17:2.4_oclgfft
2013-05-29 15:27:19 +04:00
peng xiao
006e4242b2
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft
2013-05-29 17:57:14 +08:00
Andrey Pavlenko
e28f6fae49
fixing #3027 (searching JNI even if no ant), fixing java tests status message (ON/OFF)
2013-05-29 12:51:26 +04:00
yao
a9b7ff41bd
adjust test cases
2013-05-29 15:48:56 +08:00
peng xiao
d015fa76fa
Fix 2.4 ocl Canny.
...
This fix is a workaround for current 2.4 branch without introducing an
additional oclMat buffer into CannyBuf object.
Test case is cleaned up.
Volatile keywords in kernels are removed for performance concern.
2013-05-29 14:15:26 +08:00
Vadim Pisarevsky
2ccdf56119
Merge pull request #913 from janm399:2.4
2013-05-28 22:05:14 +04:00
Vadim Pisarevsky
24ca620c32
Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK
2013-05-28 22:04:37 +04:00
Vadim Pisarevsky
d3c7ae6adf
Merge pull request #919 from abidrahmank:2.4
2013-05-28 21:54:51 +04:00
Vadim Pisarevsky
ecb1f3c4d2
Merge pull request #923 from pengx17:2.4_macfix
2013-05-28 21:54:25 +04:00
yao
d81c145fa9
fix memory leak
2013-05-28 18:07:41 +08:00
yao
14bd6402be
revise perf
2013-05-28 17:53:06 +08:00
peng xiao
1d0c283508
Fix a bug when pushing pointers of arguments into std::vector.
...
When argument pointers pushed into an vector and the pointers point to
address on stack, we need to make sure they are valid until kernels are
successfully flushed onto the queue.
2013-05-28 17:27:55 +08:00
Alexander Smorkalov
f85cf5bdd9
Build fixes. Build scrips reorganized.
2013-05-28 12:27:56 +04:00
peng xiao
6fae02c05d
Fix some OpenCL kernel file build errors on Mac.
2013-05-28 11:12:05 +08:00
Roman Donchenko
7561b1c6e5
Replace the pull request guidelines with a link to the wiki.
...
I've moved the contents of CONTRIBUTING.md to the wiki (and slightly
expanded it), so the former is no longer required. I've put a link to the
wiki page and a summary in the README.
2013-05-27 17:48:34 +04:00
