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.
12 years ago
Vadim Pisarevsky
37091b086c
Merge pull request #932 from bitwangyaoyao:2.4_fixBFM
12 years ago
Vadim Pisarevsky
6bb9342a5f
Merge pull request #918 from bitwangyaoyao:2.4_samples
12 years ago
Vadim Pisarevsky
5a4efe8bcf
Merge pull request #924 from pengx17:2.4_arithm_fix
12 years ago
Vadim Pisarevsky
678371be39
Merge pull request #925 from pengx17:2.4_canny_tmp_fix
12 years ago
Vadim Pisarevsky
c176131a67
Merge pull request #927 from bitwangyaoyao:2.4_perf
12 years ago
Roman Donchenko
c3f5e73769
Merge pull request #930 from pengx17:2.4_haar_ext
12 years ago
yao
7ed9c0e87a
Fix brute_force_matcher's hung on some Intel CPU OCL
12 years ago
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.
12 years ago
Vladislav Vinogradov
6b1c28ce6d
fixed some gpu tests (different rounding results due to float arithmetics)
12 years ago
Roman Donchenko
0ae40507e5
Merge pull request #928 from apavlenko:bugfix_3027
12 years ago
Roman Donchenko
fbb25787cd
Merge pull request #920 from asmorkalov:android_move
12 years ago
Roman Donchenko
d81d3fc830
Merge pull request #921 from SpecLad:merge-2.4
12 years ago
Roman Donchenko
b890274738
Merge pull request #910 from pengx17:2.4_oclgfft
12 years ago
peng xiao
006e4242b2
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_oclgfft
12 years ago
Andrey Pavlenko
e28f6fae49
fixing #3027 (searching JNI even if no ant), fixing java tests status message (ON/OFF)
12 years ago
yao
a9b7ff41bd
adjust test cases
12 years ago
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.
12 years ago
Vadim Pisarevsky
2ccdf56119
Merge pull request #913 from janm399:2.4
12 years ago
Vadim Pisarevsky
24ca620c32
Merge pull request #916 from bitwangyaoyao:2.4_fixPyrLK
12 years ago
Vadim Pisarevsky
d3c7ae6adf
Merge pull request #919 from abidrahmank:2.4
12 years ago
Vadim Pisarevsky
ecb1f3c4d2
Merge pull request #923 from pengx17:2.4_macfix
12 years ago
yao
d81c145fa9
fix memory leak
12 years ago
yao
14bd6402be
revise perf
12 years ago
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.
12 years ago
Alexander Smorkalov
f85cf5bdd9
Build fixes. Build scrips reorganized.
12 years ago
peng xiao
6fae02c05d
Fix some OpenCL kernel file build errors on Mac.
12 years ago
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.
12 years ago
Roman Donchenko
5ac3b8d5d8
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Pull requests:
#904 from ograycode:2.4
#905 from bitwangyaoyao:2.4_TVL1
#902 from apavlenko:fix_run_py
#882 from pengx17:2.4_rewrite_query_info
Conflicts:
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/hog.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/tvl1flow.cpp
12 years ago
Alexander Smorkalov
20fef00a77
android -> plarforms/android
12 years ago
abidrahmank
2dd3bf116e
ANDed waitkey result with 0xFF for x64 systems
12 years ago
abidrahmank
ca09ba6852
Bug #2960 : docs about CV_BGR2GRAY
12 years ago
abidrahmank
98960bf201
A new python sample on grabcut
12 years ago
yao
fad96b95ad
add results verification to facedetect and hog samples
12 years ago
yao
c58e0d5d73
fix hog
12 years ago
Roman Donchenko
56121d01ea
Merge pull request #911 from jrdi:patch-1
12 years ago
Roman Donchenko
cfa985db43
Merge pull request #917 from SpecLad:cuda-4-build
12 years ago
yao
036b0579f1
remove the images in ocl sample folder
12 years ago
yao
33a3a19207
add two samples
12 years ago
Roman Donchenko
dad58d8940
Fix a build error which manifests when building with CUDA < 5.
12 years ago
yao
d45f9ef866
fix Linux build errors
12 years ago
Roman Donchenko
4da0cdb959
Merge pull request #914 from SpecLad:master
12 years ago
yao
a223b5624f
fix pyrLK's mismatch on Intel GPUs
12 years ago
Roman Donchenko
324cafdda6
Merge pull request #904 from ograycode:2.4
12 years ago
Roman Donchenko
5e0e1fac87
Merge commit 'b51a1a7d' (PR #895 from 2.4)
...
Conflicts:
modules/ocl/CMakeLists.txt
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
12 years ago
Jan Machacek
46b770f255
Fixed include name in OpenCL on OS X
12 years ago
Jordi Villar
ee29b0454c
fix parenthesis
12 years ago
Andrey Pavlenko
61567adc5d
Merge pull request #797 from vhdirk:installheaders
12 years ago
Roman Donchenko
7efb24917f
Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex
12 years ago
Roman Donchenko
519ee72f6f
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
12 years ago