Commit Graph

7223 Commits

Author SHA1 Message Date
Andrey Kamaev
18ca645fd2 Merge pull request #631 from bitwangyaoyao:2.4_stereo 2013-03-15 10:34:27 +04:00
Vladislav Vinogradov
4a237af814 implemented Malvar, He, and Cutler Bayer Demosaicing on gpu 2013-03-14 18:11:12 +04:00
Andrey Kamaev
ecf770d49d Merge pull request #638 from bitwangyaoyao:2.4_fixErode 2013-03-14 11:41:02 +04:00
Andrey Kamaev
5f3eb0fc49 Merge pull request #628 from bitwangyaoyao:2.4_fixMoments 2013-03-14 11:40:47 +04:00
peng xiao
34c7162104 Merge remote-tracking branch 'upstream/2.4' into 2.4 2013-03-14 09:24:45 +08:00
yao
084385cf38 Fix a bug in ocl::Erode/Dilate, simplify the host logic 2013-03-12 16:45:43 +08:00
peng xiao
3a565e001e Remove unnecessary HAVE_OPENCL macro block. 2013-03-12 09:10:15 +08:00
yao
f8985bb7fc fix warnings on Linux 2013-03-12 08:55:50 +08:00
Andrey Kamaev
1d3219747a Merge pull request #633 from jet47:gpu-debayer-gray 2013-03-11 21:15:00 +04:00
Andrey Kamaev
632211eb27 Merge pull request #630 from asmorkalov:android_view_stretch 2013-03-11 21:14:43 +04:00
Andrey Kamaev
980fc93b4d Fix clang + ccache build warnings 2013-03-11 18:41:22 +04:00
Andrey Kamaev
d1a148b06f Merge pull request #635 from taka-no-me:c++11 2013-03-11 17:35:46 +04:00
Vladislav Vinogradov
4ddf634c30 gpu : implement Bayer* -> Gray color conversion 2013-03-11 15:41:50 +04:00
Andrey Kamaev
ec8637a990 Fix build errors 2013-03-11 14:52:22 +04:00
peng xiao
34998b6034 Add ocl::SURF accurate test.
The test cases are ported from gpu module (masked version is still
missing).
Key point direction definition is synchronized with cv::SURF.
nonfree module dependency is added into ocl module's cmake file.
2013-03-11 18:35:30 +08:00
yao
3f81a152b9 remove the OpenCL define 2013-03-11 17:21:31 +08:00
yao
0f0a4c3099 add stereoBM function 2013-03-11 17:10:58 +08:00
Alexander Smorkalov
8942eaf0d7 Stetch support for Android View classes added (Feature #2840) 2013-03-11 11:17:19 +04:00
yao
7f0d6d42f0 fix mismatch on NV OCL and some AMD GPUs 2013-03-08 10:30:01 +08:00
Andrey Kamaev
13f402a554 Merge pull request #620 from apavlenko:java_tutorial_fix 2013-03-06 15:47:09 +04:00
Andrey Pavlenko
0e64baaec5 removing redundant code 2013-03-06 13:00:00 +04:00
Andrey Pavlenko
de3767df0a minor formatting 2013-03-06 12:59:38 +04:00
Andrey Pavlenko
aaefd31844 more formatting 2013-03-05 19:03:36 +04:00
Andrey Pavlenko
23fb570cbd updating JNI lib location for Unix; formatting update 2013-03-05 18:42:14 +04:00
Andrey Pavlenko
116d3be9c0 moving JNI library to 'build/lib' dir on non-Win 2013-03-05 18:41:44 +04:00
Andrey Kamaev
bbac4bc4cf Merge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p 2013-03-05 15:26:16 +04:00
Andrey Kamaev
facab40745 Disable -fomit-frame-pointer for OS X Clang as it leads to crash on exception thrown 2013-03-01 19:44:17 +04:00
Andrey Kamaev
08545b8f96 Merge pull request #603 from taka-no-me:avoid_deps_on_missing_lib 2013-03-01 17:10:46 +04:00
Andrey Kamaev
f22ee8fc19 Merge pull request #602 from bitwangyaoyao:2.4_fixAdd 2013-03-01 17:10:11 +04:00
Andrey Kamaev
e6cb44edc3 Merge pull request #600 from taka-no-me:fix_build_warnings 2013-03-01 17:09:56 +04:00
Andrey Kamaev
1094179155 Avoid build falure in armeabi build with Android SDK 2013-03-01 16:50:42 +04:00
cuda-geek
a706de2446 Merge pull request #601 from apavlenko:android_tutorial_update 2013-03-01 16:09:25 +04:00
yao
65bb4250a4 Fix a bug in addWeighted x64 mode
And a potential problem in remap
2013-03-01 18:08:53 +08:00
Andrey Pavlenko
07b1ccdeb0 removing redundant picture resize 2013-03-01 13:56:50 +04:00
Andrey Kamaev
2128b82c6b Merge pull request #598 from asmorkalov:lib_info_fix 2013-03-01 13:52:57 +04:00
Andrey Pavlenko
978132edc1 minor Android tutorial fixes 2013-03-01 13:52:14 +04:00
Andrey Kamaev
22d33373fa Fix build warnings on MSVC x64 and OS X clang 2013-03-01 13:29:43 +04:00
Andrey Kamaev
eaaba1336a Merge pull request #595 from bitwangyaoyao:2.4_perfTest 2013-03-01 12:49:43 +04:00
Andrey Kamaev
85c7a36f93 Merge pull request #594 from asmorkalov:android_all_build_fix 2013-03-01 12:49:27 +04:00
Andrey Kamaev
6be6adbbed Merge pull request #593 from apavlenko:java_tutorial_fixes 2013-03-01 12:49:15 +04:00
Alexander Smorkalov
da455efc26 Full package version fixed. 2013-03-01 12:44:14 +04:00
Vadim Pisarevsky
a910360689 Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher 2013-03-01 10:55:11 +04:00
yao
8f3883a28d fix a compile warning 2013-03-01 10:06:51 +08:00
yao
82b9854837 fix compile warnings 2013-03-01 08:47:20 +08:00
Alexander
3cfd3d3ee0 Build with OpenCV.mk for all terget fixed. 2013-02-28 21:43:57 +04:00
Andrey Pavlenko
af2552d72c fixing issues from http://www.code.opencv.org/issues/2807 2013-02-28 19:11:24 +04:00
Andrey Kamaev
c865b28243 Merge pull request #591 from jet47:gpu-sanity-tests 2013-02-28 18:08:11 +04:00
Andrey Kamaev
79cf292d78 Merge pull request #590 from apavlenko:java_fixes 2013-02-28 18:07:33 +04:00
Andrey Kamaev
1018d110d6 Merge pull request #589 from taka-no-me:2digit_pyversion 2013-02-28 18:06:43 +04:00
Andrey Kamaev
fba0e6fc5c Merge pull request #587 from bitwangyaoyao:2.4_fixHog 2013-02-28 18:06:28 +04:00