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
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
2013-05-27 16:58:04 +04:00
Alexander Smorkalov
20fef00a77
android -> plarforms/android
2013-05-27 11:10:38 +04:00
abidrahmank
2dd3bf116e
ANDed waitkey result with 0xFF for x64 systems
2013-05-27 10:30:30 +05:30
abidrahmank
ca09ba6852
Bug #2960 : docs about CV_BGR2GRAY
2013-05-25 01:50:41 +05:30
abidrahmank
98960bf201
A new python sample on grabcut
2013-05-25 00:55:31 +05:30
yao
fad96b95ad
add results verification to facedetect and hog samples
2013-05-24 15:52:33 +08:00
yao
c58e0d5d73
fix hog
2013-05-24 13:46:21 +08:00
Roman Donchenko
56121d01ea
Merge pull request #911 from jrdi:patch-1
2013-05-23 15:17:55 +04:00
Roman Donchenko
cfa985db43
Merge pull request #917 from SpecLad:cuda-4-build
2013-05-23 15:15:00 +04:00
yao
036b0579f1
remove the images in ocl sample folder
2013-05-23 18:12:09 +08:00
yao
33a3a19207
add two samples
2013-05-23 18:10:38 +08:00
Roman Donchenko
dad58d8940
Fix a build error which manifests when building with CUDA < 5.
2013-05-23 14:00:13 +04:00
yao
d45f9ef866
fix Linux build errors
2013-05-23 17:58:50 +08:00
Roman Donchenko
4da0cdb959
Merge pull request #914 from SpecLad:master
2013-05-23 13:54:57 +04:00
yao
a223b5624f
fix pyrLK's mismatch on Intel GPUs
2013-05-23 10:55:08 +08:00
Roman Donchenko
324cafdda6
Merge pull request #904 from ograycode:2.4
2013-05-22 18:46:40 +04:00
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
2013-05-22 18:28:28 +04:00
Jan Machacek
46b770f255
Fixed include name in OpenCL on OS X
2013-05-22 13:22:16 +01:00
Jordi Villar
ee29b0454c
fix parenthesis
2013-05-22 13:57:43 +03:00
Andrey Pavlenko
61567adc5d
Merge pull request #797 from vhdirk:installheaders
2013-05-22 13:54:20 +04:00
Roman Donchenko
7efb24917f
Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex
2013-05-22 12:57:04 +04:00
Roman Donchenko
519ee72f6f
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
2013-05-22 12:08:16 +04:00
Roman Donchenko
b5c013682b
Merge pull request #907 from SpecLad:master
2013-05-22 12:03:28 +04:00
peng xiao
b4a4a05bdc
Add ocl's good features to track implementation.
...
Additional notes with this commit:
1. Add cornerHarris_dxdy and cornerMinEigenVal_dxdy to get
the interim dx and dy output of Sobel operator;
2. Add minMax_buf to allow user to reuse buffers in minMax;
3. Fix an error when either min or max pointer fed into minMax is NULL;
4. Corner sorter temporarily uses C++ STL's quick sort. A parallel
selection sort in OpneCL is contained in the implementation but disabled
due to poor performance at the moment.
5. Accuracy test for ocl gfft.
2013-05-22 13:46:42 +08:00
Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Andrey Pavlenko
d4255b7f75
Merge pull request #902 from apavlenko:fix_run_py
2013-05-21 14:07:32 +04:00
alex77git
445860d619
(typo)
2013-05-20 13:19:36 +02:00
alex77git
c8abaea368
(tab to space) 2x
2013-05-20 12:06:25 +02:00
Vadim Pisarevsky
cbbc82a789
Merge pull request #882 from pengx17:2.4_rewrite_query_info
2013-05-20 14:01:03 +04:00
Vadim Pisarevsky
b51a1a7d15
Merge pull request #895 from bitwangyaoyao:2.4_perf
2013-05-20 14:00:47 +04:00
Leszek Swirski
7542d66dbd
Fix drawing documentation referring to C API macros
2013-05-20 10:56:06 +01:00
Roman Donchenko
389be67605
Merge pull request #853 from icylord:2.4
2013-05-20 12:11:47 +04:00
yao
d8b192c84d
Fix the mismatch on NV GPUs
2013-05-20 14:46:17 +08:00