peng xiao
6fae02c05d
Fix some OpenCL kernel file build errors on Mac.
2013-05-28 11:12:05 +08:00
Roman Donchenko
324cafdda6
Merge pull request #904 from ograycode:2.4
2013-05-22 18:46:40 +04:00
Roman Donchenko
519ee72f6f
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
2013-05-22 12:08:16 +04:00
Andrey Pavlenko
d4255b7f75
Merge pull request #902 from apavlenko:fix_run_py
2013-05-21 14:07:32 +04: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
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
ograycode
97e9368e75
Simple set of the camera index to allow the user to change it after the object has been initialized.
2013-05-19 22:04:56 -04:00
Andrey Pavlenko
4af104aaae
'aapt' tool moved in SDK r22, adding support to run.py
2013-05-19 14:57:21 +04:00
Vadim Pisarevsky
aee6a617a6
Merge pull request #897 from bitwangyaoyao:2.4_TVL1
2013-05-19 00:23:24 +04:00
yao
04399a27d0
fix a warning
2013-05-17 15:44:22 +08:00
yao
4162ebfad3
add OpticalFlowDual_TVL1_OCL function
2013-05-17 15:34:22 +08:00
yao
03c55db4fb
fix the waring in gemm test
2013-05-17 13:19:09 +08:00
yao
5f20fce6fd
add accuracy tests while running perf
2013-05-17 13:18:46 +08:00
Andrey Pavlenko
528db00095
Merge pull request #892 from jet47:removed-vibe
2013-05-16 18:44:07 +04:00
Vladislav Vinogradov
ec52096e30
removed VIBE implementation
2013-05-16 13:47:24 +04:00
Vadim Pisarevsky
7d9041460a
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
2013-05-15 14:21:50 +04:00
Vadim Pisarevsky
4d866ea32e
Merge pull request #884 from pengx17:2.4_pyrup_fix
2013-05-15 14:18:54 +04:00
peng xiao
d053f2165d
Add BFMatcher_OCL class alias for BruteForceMatcher_OCL.
...
This adds a similar interface with pure-cpp and gpu versions.
2013-05-15 10:47:17 +08:00
peng xiao
3f93c3cc4e
Clean up spaces in ocl.hpp
2013-05-15 10:43:47 +08:00
peng xiao
1ecc765903
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
2013-05-15 08:55:43 +08:00
peng xiao
df3997b108
Fix ocl::pyrUp
...
Use predefined OpenCL function to convert integers to floating points.
This is more accurate than before as it enables:
1. saturate cast
2. customized rounding
2013-05-15 08:51:21 +08:00
Vadim Pisarevsky
2a646f7626
Merge pull request #862 from piponazo:v4lFPS
2013-05-14 16:00:28 +04:00
Vadim Pisarevsky
25e6902a43
Merge pull request #818 from bitwangyaoyao:2.4_optBlur
2013-05-14 15:56:56 +04:00
Vadim Pisarevsky
bd1d7cd208
Merge pull request #839 from pengx17:2.4_ocl_csbp
2013-05-14 15:56:07 +04:00
Vadim Pisarevsky
87765c0f16
Merge pull request #883 from bitwangyaoyao:2.4_fixMoments
2013-05-14 15:55:38 +04:00
yao
1d1d28baf2
fix black screen when input Mat is large
2013-05-14 18:02:53 +08:00
peng xiao
ac21cabda2
Copy ocl::queryDeviceInfo interface from master to 2.4.
...
Affected functions surf.ocl, pyrlk.ocl and hog.ocl are updated with the change.
2013-05-14 17:50:38 +08:00
Andrey Pavlenko
87fcd2342f
Merge pull request #878 from apavlenko:better_glue_search
2013-05-14 11:57:25 +04:00
Vadim Pisarevsky
35d8fa444b
Merge pull request #849 from dominikrose:dom_2.4
2013-05-13 23:38:26 +04:00
Vadim Pisarevsky
d79c05fec9
Merge pull request #872 from pengx17:2.4_create2dimage_fix
2013-05-13 23:12:25 +04:00
Vadim Pisarevsky
6eb5a95a59
Merge pull request #871 from bitwangyaoyao:2.4_acry
2013-05-13 23:04:11 +04:00
Vadim Pisarevsky
fd83f2f5ca
Merge pull request #819 from bitwangyaoyao:2.4_haarBuf
2013-05-13 22:36:10 +04:00
Vadim Pisarevsky
c549ec8371
Merge pull request #850 from SpecLad:convhull-orientation
2013-05-13 22:18:54 +04:00
Andrey Pavlenko
d94ecf40e6
Merge pull request #880 from apavlenko:qt-5.0
2013-05-13 21:18:47 +04:00
Andrey Pavlenko
0fec2eb6e5
Merge pull request #879 from apavlenko:gcc-4.8
2013-05-13 21:17:04 +04:00
Vadim Pisarevsky
e4d4b07f00
Merge pull request #873 from prclibo:2.4
2013-05-13 21:06:54 +04:00
Andrey Kamaev
f856f78ac0
Update CMake scripts to recognize Qt 5.0
2013-05-13 17:10:32 +04:00
Andrey Kamaev
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
Andrey Kamaev
60059a7aa0
Improve handling of native_app_glue dependency in Android samples
2013-05-13 17:01:18 +04:00
yao
e23884a238
fix the warnings in fft tests
2013-05-13 15:04:23 +08:00
Vadim Pisarevsky
9cce8ca4b6
Merge pull request #864 from pengx17:2.4_stereobm
2013-05-12 22:16:03 +04:00
Vadim Pisarevsky
1348e7cd4d
Merge pull request #877 from apavlenko:version_info_in_test_log
2013-05-12 22:15:47 +04:00
Andrey Pavlenko
d5881bc00a
adding version info to test log
2013-05-12 18:36:55 +04:00
yao
ada8f92cc7
fix warnings, unify test names
2013-05-09 17:57:13 +08:00
Bo Li
81779d8287
fixed pca bug for fixed mean input
2013-05-09 15:20:00 +08:00
peng xiao
e14acabb3d
Fix ocl moudle build with latest Intel OpenCL SDK.
...
We found that cl.h file provided in latest Intel SDK muted deprecated interfaces.
2013-05-09 14:00:36 +08:00
peng xiao
69e6d0016e
Optimize stereobm a bit.
...
Speedup about 30% on 6730M GPU.
2013-05-08 17:29:24 +08:00
yao
b6313951dc
use clean EXPECT_MAT_NEAR (no string output)
2013-05-08 17:07:44 +08:00