Leszek Swirski
0e8c2b0395
Fix visibility of g_linked_ptr_mutex on Windows
...
Reverts some changes in b8ed00bd64
2013-05-15 14:42:28 +01: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
54afb85d0c
Merge pull request #823 from pickle27:starter_image_sequence
2013-05-14 15:56:35 +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
14c50d2fce
Merge pull request #874 from pengx17:master_queryDeviceInfo_rewrite
2013-05-13 23:03:24 +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
Vadim Pisarevsky
6e44e0a476
Merge pull request #881 from apavlenko:hidden_visibility
2013-05-13 22:08:45 +04:00
Andrey Pavlenko
885566295a
Merge pull request #840 from pablospe:master
2013-05-13 21:22:27 +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
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
2013-05-13 18:33:20 +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
Vadim Pisarevsky
8130d92602
Merge pull request #841 from Pastafarianist:patch-1
2013-05-12 13:00:23 +04:00
Vadim Pisarevsky
103ee12f00
Merge pull request #845 from githubuser0xFFFF:master
2013-05-12 12:54:44 +04:00
Vadim Pisarevsky
4b49b84976
Merge pull request #848 from pengx17:master_ocl_platform_name
2013-05-12 12:54:25 +04:00
Vadim Pisarevsky
f1e8f69d2c
Merge pull request #861 from albenoit:master
2013-05-12 12:53:14 +04:00
Vadim Pisarevsky
7f083a049d
Merge pull request #867 from Pastafarianist:patch-2
2013-05-12 12:52:46 +04:00
yao
ada8f92cc7
fix warnings, unify test names
2013-05-09 17:57:13 +08:00
peng xiao
e5ea018185
Let surf.ocl use the new queryDeviceInfo interface.
2013-05-09 17:19:51 +08:00
peng xiao
bfa0f02303
Rewrite queryDeviceInfo interface.
...
Previously the function may cause some unsafe issue. It is fixed now by introducing a template parameter.
2013-05-09 17:15:26 +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
peng xiao
861de8a6e9
CL_PLATFORM_VENDOR should be CL_PLATFORM_NAME.
2013-05-08 17:19:34 +08:00
yao
b6313951dc
use clean EXPECT_MAT_NEAR (no string output)
2013-05-08 17:07:44 +08:00
yao
35c6860f06
further simplify the logics in filter tests
2013-05-08 16:08:33 +08:00
yao
1a53e2cfb2
remove interpolation.hpp
2013-05-08 15:27:35 +08:00
yao
3928c1ee26
add copyrights
2013-05-08 15:21:53 +08:00