Dominik Rose
d0788be129
Merge branch 'mingw-libdc1394-2-windows' of https://github.com/dominikrose/opencv into mingw-libdc1394-2-windows
2013-05-14 16:31:01 +02:00
Dominik Rose
86ec9b79fd
libd1394 2.x support for mingw on windows added
2013-05-14 16:30:12 +02:00
Dominik Rose
9247ad634f
libd1394 2.x support for mingw on windows added
2013-05-14 16:20:01 +02: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
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
yao
e4d3378230
simplify logics in filter tests, remove redundant code in arithm tests
2013-05-08 15:12:12 +08:00
Andrey Pavlenko
2aa5f1bfd1
Merge pull request #866 from MadEgg:RetrieveFrame_index_argument
2013-05-07 17:00:29 +04:00
Vadim Pisarevsky
741fb9b7d1
Merge pull request #865 from pengx17:2.4_ocl_ver
2013-05-07 16:39:49 +04:00
Andrey Pavlenko
2faa2adae2
Merge pull request #846 from smart-mobile-software:tuto_crash
2013-05-07 15:15:16 +04:00
poiuytrez
7dda8e2cb8
Link to bug tracker replaced by bug description
2013-05-07 11:45:18 +02:00
yao
52dbbae82c
some cleanup, remove some commented codes
2013-05-07 16:14:50 +08:00
peng xiao
d34e7eca60
Suppress warning when compiling deprecated OpenCL function on GNU compilers.
2013-05-06 17:16:45 +08:00
Egbert van der Wal
dc6a144396
add (optional) index argument to RetrieveFrame method
2013-05-04 17:18:12 +02:00
peng xiao
ed2199a497
Fix build
2013-05-03 09:54:11 +08:00
peng xiao
1eca49f40b
ocl: Enable backward binary portability for setTo function.
2013-05-03 09:45:56 +08:00
peng xiao
168c0b0385
Optimize ocl::stereobm.
...
1. Use macro defines for some parameters(radius).
2. Reduce local memory usage.
3. Fix accuracy problem on Intel GPU.
2013-05-02 16:14:28 +08:00
peng xiao
355bc691fc
Add OpenCL version 1.2 query into ocl::Context::supportsFeature().
...
Add backwards portability for OpenCL 1.1 when OpenCV executables
are compiled with OpenCL 1.2 profile support.
2013-05-02 14:44:59 +08:00
poiuytrez
bef6de9025
Fix tuto3 picture taken crash on all devices
...
A modification of the JavaCameraView is needed to avoid a crash when the
app is exited. It is a good practice to remove the callback after the
stopPreview method.
2013-05-01 16:58:15 +02:00
Luis Díaz Más
d13d5c0c12
Added setting feature of FPS in cap_libv4l
2013-05-01 01:07:03 +02:00
Andrey Pavlenko
48a8aefd6b
Merge pull request #854 from asmorkalov:android_null_invalid_cam
2013-04-30 17:36:39 +04:00
Andrey Pavlenko
f21e99de0f
Merge pull request #858 from apavlenko:fix_ocl_build_on_bb
2013-04-30 11:25:31 +04:00
Andrey Pavlenko
108bb811c5
fixing precommit build on ubuntu-64 (now it takes OCL headers from non-default OCL SDK, but libs from default one)
2013-04-29 23:10:03 +04:00
