cuda-geek [Sun, 17 Mar 2013 19:00:04 +0000 (23:00 +0400)]
Merge pull request #660 from Nerei:2.4
Vadim Pisarevsky [Sun, 17 Mar 2013 15:13:37 +0000 (19:13 +0400)]
Merge pull request #532 from jet47:super-resolution
Anatoly Baksheev [Sun, 17 Mar 2013 14:43:55 +0000 (18:43 +0400)]
bugfix in sample to support LBP classifier. To merge to master also.
cuda-geek [Fri, 15 Mar 2013 09:55:03 +0000 (13:55 +0400)]
Merge pull request #644 from jet47:gpu-debayer-mht
Andrey Kamaev [Fri, 15 Mar 2013 06:34:43 +0000 (10:34 +0400)]
Merge pull request #632 from pengx17:2.4
Andrey Kamaev [Fri, 15 Mar 2013 06:34:27 +0000 (10:34 +0400)]
Merge pull request #631 from bitwangyaoyao:2.4_stereo
Vladislav Vinogradov [Wed, 13 Mar 2013 10:54:06 +0000 (14:54 +0400)]
implemented Malvar, He, and Cutler Bayer Demosaicing on gpu
Andrey Kamaev [Thu, 14 Mar 2013 07:41:02 +0000 (11:41 +0400)]
Merge pull request #638 from bitwangyaoyao:2.4_fixErode
Andrey Kamaev [Thu, 14 Mar 2013 07:40:47 +0000 (11:40 +0400)]
Merge pull request #628 from bitwangyaoyao:2.4_fixMoments
peng xiao [Thu, 14 Mar 2013 01:24:45 +0000 (09:24 +0800)]
Merge remote-tracking branch 'upstream/2.4' into 2.4
yao [Tue, 12 Mar 2013 08:45:43 +0000 (16:45 +0800)]
Fix a bug in ocl::Erode/Dilate, simplify the host logic
peng xiao [Tue, 12 Mar 2013 01:10:15 +0000 (09:10 +0800)]
Remove unnecessary HAVE_OPENCL macro block.
yao [Tue, 12 Mar 2013 00:55:50 +0000 (08:55 +0800)]
fix warnings on Linux
Andrey Kamaev [Mon, 11 Mar 2013 17:15:00 +0000 (21:15 +0400)]
Merge pull request #633 from jet47:gpu-debayer-gray
Andrey Kamaev [Mon, 11 Mar 2013 17:14:43 +0000 (21:14 +0400)]
Merge pull request #630 from asmorkalov:android_view_stretch
Andrey Kamaev [Mon, 11 Mar 2013 14:40:40 +0000 (18:40 +0400)]
Fix clang + ccache build warnings
Andrey Kamaev [Mon, 11 Mar 2013 13:35:46 +0000 (17:35 +0400)]
Merge pull request #635 from taka-no-me:c++11
Vladislav Vinogradov [Mon, 11 Mar 2013 11:41:50 +0000 (15:41 +0400)]
gpu : implement Bayer* -> Gray color conversion
Andrey Kamaev [Mon, 11 Mar 2013 10:52:22 +0000 (14:52 +0400)]
Fix build errors
peng xiao [Mon, 11 Mar 2013 10:35:30 +0000 (18:35 +0800)]
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.
yao [Mon, 11 Mar 2013 09:21:31 +0000 (17:21 +0800)]
remove the OpenCL define
yao [Mon, 11 Mar 2013 09:10:58 +0000 (17:10 +0800)]
add stereoBM function
Alexander Smorkalov [Mon, 11 Mar 2013 07:17:19 +0000 (11:17 +0400)]
Stetch support for Android View classes added (Feature #2840)
yao [Fri, 8 Mar 2013 02:30:01 +0000 (10:30 +0800)]
fix mismatch on NV OCL and some AMD GPUs
Andrey Kamaev [Wed, 6 Mar 2013 11:47:09 +0000 (15:47 +0400)]
Merge pull request #620 from apavlenko:java_tutorial_fix
Andrey Pavlenko [Wed, 6 Mar 2013 09:00:00 +0000 (13:00 +0400)]
removing redundant code
Andrey Pavlenko [Wed, 6 Mar 2013 08:59:38 +0000 (12:59 +0400)]
minor formatting
Andrey Pavlenko [Tue, 5 Mar 2013 15:03:36 +0000 (19:03 +0400)]
more formatting
Andrey Pavlenko [Tue, 5 Mar 2013 14:42:14 +0000 (18:42 +0400)]
updating JNI lib location for Unix; formatting update
Andrey Pavlenko [Tue, 5 Mar 2013 14:41:44 +0000 (18:41 +0400)]
moving JNI library to 'build/lib' dir on non-Win
Andrey Kamaev [Tue, 5 Mar 2013 11:26:15 +0000 (15:26 +0400)]
Merge pull request #491 from Daniil-Osokin:cvtRGB2YUV420p
Andrey Kamaev [Fri, 1 Mar 2013 15:44:17 +0000 (19:44 +0400)]
Disable -fomit-frame-pointer for OS X Clang as it leads to crash on exception thrown
Andrey Kamaev [Fri, 1 Mar 2013 13:10:45 +0000 (17:10 +0400)]
Merge pull request #603 from taka-no-me:avoid_deps_on_missing_lib
Andrey Kamaev [Fri, 1 Mar 2013 13:10:11 +0000 (17:10 +0400)]
Merge pull request #602 from bitwangyaoyao:2.4_fixAdd
Andrey Kamaev [Fri, 1 Mar 2013 13:09:56 +0000 (17:09 +0400)]
Merge pull request #600 from taka-no-me:fix_build_warnings
Andrey Kamaev [Fri, 1 Mar 2013 12:50:42 +0000 (16:50 +0400)]
Avoid build falure in armeabi build with Android SDK
cuda-geek [Fri, 1 Mar 2013 12:09:25 +0000 (16:09 +0400)]
Merge pull request #601 from apavlenko:android_tutorial_update
yao [Fri, 1 Mar 2013 10:08:53 +0000 (18:08 +0800)]
Fix a bug in addWeighted x64 mode
And a potential problem in remap
Andrey Pavlenko [Fri, 1 Mar 2013 09:56:50 +0000 (13:56 +0400)]
removing redundant picture resize
Andrey Kamaev [Fri, 1 Mar 2013 09:52:57 +0000 (13:52 +0400)]
Merge pull request #598 from asmorkalov:lib_info_fix
Andrey Pavlenko [Fri, 1 Mar 2013 09:52:14 +0000 (13:52 +0400)]
minor Android tutorial fixes
Andrey Kamaev [Fri, 1 Mar 2013 08:17:05 +0000 (12:17 +0400)]
Fix build warnings on MSVC x64 and OS X clang
Andrey Kamaev [Fri, 1 Mar 2013 08:49:43 +0000 (12:49 +0400)]
Merge pull request #595 from bitwangyaoyao:2.4_perfTest
Andrey Kamaev [Fri, 1 Mar 2013 08:49:27 +0000 (12:49 +0400)]
Merge pull request #594 from asmorkalov:android_all_build_fix
Andrey Kamaev [Fri, 1 Mar 2013 08:49:15 +0000 (12:49 +0400)]
Merge pull request #593 from apavlenko:java_tutorial_fixes
Alexander Smorkalov [Fri, 1 Mar 2013 08:44:14 +0000 (12:44 +0400)]
Full package version fixed.
Vadim Pisarevsky [Fri, 1 Mar 2013 06:55:11 +0000 (10:55 +0400)]
Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher
yao [Fri, 1 Mar 2013 02:06:51 +0000 (10:06 +0800)]
fix a compile warning
yao [Fri, 1 Mar 2013 00:47:20 +0000 (08:47 +0800)]
fix compile warnings
Alexander [Thu, 28 Feb 2013 17:43:57 +0000 (21:43 +0400)]
Build with OpenCV.mk for all terget fixed.
Andrey Pavlenko [Thu, 28 Feb 2013 14:12:36 +0000 (18:12 +0400)]
fixing issues from www.code.opencv.org/issues/2807
Andrey Kamaev [Thu, 28 Feb 2013 14:08:11 +0000 (18:08 +0400)]
Merge pull request #591 from jet47:gpu-sanity-tests
Andrey Kamaev [Thu, 28 Feb 2013 14:06:57 +0000 (18:06 +0400)]
Merge pull request #590 from apavlenko:java_fixes
Andrey Kamaev [Thu, 28 Feb 2013 14:06:43 +0000 (18:06 +0400)]
Merge pull request #589 from taka-no-me:2digit_pyversion
Andrey Kamaev [Thu, 28 Feb 2013 14:06:27 +0000 (18:06 +0400)]
Merge pull request #587 from bitwangyaoyao:2.4_fixHog
Andrey Kamaev [Thu, 28 Feb 2013 14:06:13 +0000 (18:06 +0400)]
Merge pull request #585 from bitwangyaoyao:2.4_SURF
Andrey Kamaev [Thu, 28 Feb 2013 14:05:55 +0000 (18:05 +0400)]
Merge pull request #525 from odeniz:2.4
Andrey Pavlenko [Thu, 28 Feb 2013 13:19:52 +0000 (17:19 +0400)]
patch -> revision
Andrey Pavlenko [Thu, 28 Feb 2013 12:56:53 +0000 (16:56 +0400)]
adding more version-related variables
Vladislav Vinogradov [Thu, 28 Feb 2013 12:43:08 +0000 (16:43 +0400)]
fixed gpu sanity tests
Andrey Kamaev [Thu, 28 Feb 2013 12:32:13 +0000 (16:32 +0400)]
Honor 2-digit python version
Andrey Pavlenko [Thu, 28 Feb 2013 12:24:52 +0000 (16:24 +0400)]
updating samples to load JNI lib with correct suffix
Andrey Pavlenko [Mon, 18 Feb 2013 07:23:44 +0000 (11:23 +0400)]
adding/fixing version suffix for desktop java library on all OSes
Andrey Kamaev [Thu, 28 Feb 2013 11:45:44 +0000 (15:45 +0400)]
Merge pull request #570 from taka-no-me:fix_android_cmakeconfig
Andrey Kamaev [Thu, 28 Feb 2013 11:44:57 +0000 (15:44 +0400)]
Merge pull request #572 from asmorkalov:manager_4_digit_version
Andrey Kamaev [Thu, 28 Feb 2013 11:44:06 +0000 (15:44 +0400)]
Merge pull request #584 from bitwangyaoyao:2.4_perfTest
Andrey Kamaev [Thu, 28 Feb 2013 11:43:50 +0000 (15:43 +0400)]
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
Alexander Smorkalov [Wed, 27 Feb 2013 10:03:02 +0000 (14:03 +0400)]
OpenCV version swithed to 4 digit in GUI and package revision number.
yao [Thu, 28 Feb 2013 08:56:39 +0000 (16:56 +0800)]
Fix ocl::HOG crash on Intel OCL
Andrey Kamaev [Thu, 28 Feb 2013 08:56:26 +0000 (12:56 +0400)]
Merge pull request #578 from jet47:nmake-ffmpeg-copy
Andrey Kamaev [Thu, 28 Feb 2013 08:56:07 +0000 (12:56 +0400)]
Merge pull request #573 from jet47:config-cross-compilation
cuda-geek [Thu, 28 Feb 2013 07:17:12 +0000 (11:17 +0400)]
Merge pull request #557 from jet47:gpu-sanity
yao [Thu, 28 Feb 2013 06:37:37 +0000 (14:37 +0800)]
linux warning fix
Vladislav Vinogradov [Wed, 27 Feb 2013 10:39:28 +0000 (14:39 +0400)]
fixed OpenCVConfig for cross-compilation:
* added CUDA to EXTRA libs if OpenCV uses it
* added -rpath-link option for linker if OpenCV was built as SHARED libs
yao [Thu, 28 Feb 2013 06:31:08 +0000 (14:31 +0800)]
Fix ocl::bruteforcematcher crash on Intel OCL
Vladislav Vinogradov [Wed, 27 Feb 2013 12:44:36 +0000 (16:44 +0400)]
fixed ffmpeg destination folder for NMake generator
yao [Thu, 28 Feb 2013 06:05:36 +0000 (14:05 +0800)]
fix bug #2787
yao [Thu, 28 Feb 2013 04:15:13 +0000 (12:15 +0800)]
adjust some test cases, use original template file name in Haar
yao [Thu, 28 Feb 2013 01:03:10 +0000 (09:03 +0800)]
fix the blend crash in some cases
Andrey Kamaev [Wed, 27 Feb 2013 23:18:54 +0000 (03:18 +0400)]
Revise git attributes
Andrey Kamaev [Wed, 27 Feb 2013 20:38:47 +0000 (00:38 +0400)]
Merge pull request #544 from AnnaKogan8:added-regressions-only-option
Andrey Kamaev [Wed, 27 Feb 2013 15:34:17 +0000 (19:34 +0400)]
Merge pull request #579 from bitwangyaoyao:2.4_perfTest
Andrey Kamaev [Wed, 27 Feb 2013 15:33:53 +0000 (19:33 +0400)]
Merge pull request #576 from bitwangyaoyao:2.4_customMat2
Andrey Kamaev [Wed, 27 Feb 2013 15:33:26 +0000 (19:33 +0400)]
Merge pull request #568 from bitwangyaoyao:2.4_moments
yao [Wed, 27 Feb 2013 13:56:03 +0000 (21:56 +0800)]
fix build errors
yao [Wed, 27 Feb 2013 13:41:04 +0000 (21:41 +0800)]
adjust matchTemplate in performance sample, as current version is too slow when template size isn't small
Andrey Kamaev [Wed, 27 Feb 2013 08:41:33 +0000 (12:41 +0400)]
Fix OpenCVConfig.cmake generated for Android platform (issue #2496)
* fix path to libraries in Android SDK
* allow to link to opencv_java.so as Android.mk does
To link to opencv_java.so you can either change your cmake to find OpenCV as
find_package(OpenCV opencv_java)
or pass -DOpenCV_FIND_COMPONENTS=opencv_java to your cmake command
Vladislav Vinogradov [Mon, 25 Feb 2013 10:33:00 +0000 (14:33 +0400)]
Super Resolution module
yao [Wed, 27 Feb 2013 09:32:32 +0000 (17:32 +0800)]
add interfaces enable custom oclMat device memory type
cuda-geek [Wed, 27 Feb 2013 08:29:44 +0000 (12:29 +0400)]
Merge pull request #559 from jet47:gpu-hough-circles
Andrey Kamaev [Wed, 27 Feb 2013 07:37:17 +0000 (11:37 +0400)]
Merge pull request #563 from taka-no-me:perf_classify_speedups
Andrey Kamaev [Wed, 27 Feb 2013 07:37:04 +0000 (11:37 +0400)]
Merge pull request #556 from bitwangyaoyao:2.4_SURF
Andrey Kamaev [Wed, 27 Feb 2013 07:36:40 +0000 (11:36 +0400)]
Merge pull request #554 from bitwangyaoyao:2.4_impvInterFrame
Andrey Kamaev [Wed, 27 Feb 2013 07:36:23 +0000 (11:36 +0400)]
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
yao [Wed, 27 Feb 2013 06:53:27 +0000 (14:53 +0800)]
remove the compile warnings
yao [Wed, 27 Feb 2013 05:45:16 +0000 (13:45 +0800)]
Add moments function
yao [Wed, 27 Feb 2013 03:16:46 +0000 (11:16 +0800)]
fix the compile warnings
yao [Wed, 27 Feb 2013 02:45:07 +0000 (10:45 +0800)]
pyrlk also take advantages of cl_image support detection
yao [Wed, 27 Feb 2013 02:24:03 +0000 (10:24 +0800)]
Put the cl_image support detection in utils
Andrey Kamaev [Tue, 26 Feb 2013 20:05:16 +0000 (00:05 +0400)]
Merge pull request #565 from cuda-geek:auto-arch
projects / platform / upstream / opencv.git / log