Andrey Kamaev [Tue, 9 Apr 2013 09:14:37 +0000 (13:14 +0400)]
Merge pull request #790 from jet47:fix-gpu-build
Andrey Kamaev [Tue, 9 Apr 2013 09:14:06 +0000 (13:14 +0400)]
Merge pull request #788 from jet47:fix-2938
Vladislav Vinogradov [Tue, 9 Apr 2013 06:41:35 +0000 (10:41 +0400)]
fixed gpu module compilation
Vladislav Vinogradov [Tue, 9 Apr 2013 06:14:25 +0000 (10:14 +0400)]
fixed bug #2938
Andrey Kamaev [Tue, 9 Apr 2013 04:53:49 +0000 (08:53 +0400)]
Merge pull request #785 from taka-no-me:split_c_cpp2
Andrey Kamaev [Tue, 9 Apr 2013 04:53:16 +0000 (08:53 +0400)]
Merge pull request #783 from pengx17:master_matchTemplate_dft
Andrey Kamaev [Tue, 9 Apr 2013 04:50:44 +0000 (08:50 +0400)]
Merge pull request #761 from jet47:gpu-core-refactoring
Andrey Kamaev [Mon, 8 Apr 2013 16:10:34 +0000 (20:10 +0400)]
Merge pull request #787 from taka-no-me:quiet_nvcc
Andrey Kamaev [Mon, 8 Apr 2013 14:15:10 +0000 (18:15 +0400)]
Cast to unsigned inside CV_XADD to quiet nvcc
Vladislav Vinogradov [Mon, 8 Apr 2013 12:13:53 +0000 (16:13 +0400)]
removed blank lines at then end of file
Vladislav Vinogradov [Mon, 8 Apr 2013 11:43:06 +0000 (15:43 +0400)]
fixed compilation warnings
Vladislav Vinogradov [Mon, 8 Apr 2013 08:37:36 +0000 (12:37 +0400)]
restore cudaSafeCall
Vladislav Vinogradov [Thu, 4 Apr 2013 16:54:35 +0000 (20:54 +0400)]
fixed source_group
Vladislav Vinogradov [Thu, 4 Apr 2013 16:54:13 +0000 (20:54 +0400)]
fixed windows build
Vladislav Vinogradov [Thu, 4 Apr 2013 16:51:20 +0000 (20:51 +0400)]
removed static_check.hpp
Vladislav Vinogradov [Thu, 4 Apr 2013 11:36:22 +0000 (15:36 +0400)]
renamed cuda namespace to cudev
Vladislav Vinogradov [Thu, 4 Apr 2013 10:27:40 +0000 (14:27 +0400)]
fixed build
Vladislav Vinogradov [Thu, 4 Apr 2013 10:27:24 +0000 (14:27 +0400)]
removed cu_safe_call.h and cu_safe_call.cpp
Vladislav Vinogradov [Wed, 3 Apr 2013 13:09:31 +0000 (17:09 +0400)]
moved common gpu utility functionality to gpu_private.hpp
Vladislav Vinogradov [Wed, 3 Apr 2013 12:04:04 +0000 (16:04 +0400)]
renamed device -> cuda
Vladislav Vinogradov [Sun, 31 Mar 2013 10:54:23 +0000 (14:54 +0400)]
moved device layer to core module
Andrey Kamaev [Mon, 8 Apr 2013 13:13:35 +0000 (17:13 +0400)]
Merge pull request #724 from jet47:tvl1-updates
Andrey Kamaev [Mon, 8 Apr 2013 11:09:48 +0000 (15:09 +0400)]
Fix build errors
Andrey Kamaev [Mon, 8 Apr 2013 09:21:19 +0000 (13:21 +0400)]
Update documentation
Andrey Kamaev [Sun, 7 Apr 2013 20:24:39 +0000 (00:24 +0400)]
Make flann headers independent from OpenCV C API
Andrey Kamaev [Sun, 7 Apr 2013 19:23:53 +0000 (23:23 +0400)]
Make photo.hpp independent from C API
Andrey Kamaev [Sun, 7 Apr 2013 18:45:38 +0000 (22:45 +0400)]
Make highgui.hpp independent from C API
Andrey Kamaev [Sat, 6 Apr 2013 14:16:51 +0000 (18:16 +0400)]
Make imgproc.hpp independent from C API
Vladislav Vinogradov [Mon, 1 Apr 2013 06:44:27 +0000 (10:44 +0400)]
fixed sanity test on Windows
Vladislav Vinogradov [Fri, 29 Mar 2013 07:36:36 +0000 (11:36 +0400)]
updated GPU version of TVL1
Stefan Walk [Fri, 22 Mar 2013 12:07:02 +0000 (13:07 +0100)]
Make rescaling flexible and add median filtering
Previously the pyramid was done with a rescaling factor of 2 (implied by the
use of pyrDown). This often leads to inferior results compared to a scale step
of e.g. 0.8 (a factor of 2 is obviously faster). This commit makes the scale
step configurable and uses a resonable default value.
The other change in this commit is that median filtering is added. This is not
described in this paper but it is done in the author's implementation. (See
e.g. "Secrets of optical flow estimation and their principles", Sun et al.,
CVPR 2010) This serves as periodic outlier removal during optimization, leading
to smoother flow fields while preserving motion edges. This includes splitting
the optimization loop into two loops.
Andrey Kamaev [Mon, 8 Apr 2013 11:11:28 +0000 (15:11 +0400)]
Merge pull request #786 from cuda-geek:fix-build-gpu-off-cuda-on
Andrey Kamaev [Mon, 8 Apr 2013 11:11:16 +0000 (15:11 +0400)]
Merge pull request #784 from jet47:fix-gpu-build
marina.kolpakova [Mon, 8 Apr 2013 09:07:06 +0000 (13:07 +0400)]
fix build without gpu module with cuda
Vladislav Vinogradov [Thu, 4 Apr 2013 07:00:36 +0000 (11:00 +0400)]
fixed compilation with CUDA
peng xiao [Mon, 8 Apr 2013 09:15:52 +0000 (17:15 +0800)]
Add some documentation on ocl::convolve
peng xiao [Mon, 8 Apr 2013 08:22:20 +0000 (16:22 +0800)]
Fix some compilation errors and warnings.
peng xiao [Mon, 8 Apr 2013 07:19:44 +0000 (15:19 +0800)]
ocl: Add dft based convolve implementation.
Match template in ocl module now can be utilized with dft based
convolve. Note this feature needs OpenCV to be built with clAmdFft
library.
Andrey Kamaev [Mon, 8 Apr 2013 06:11:33 +0000 (10:11 +0400)]
Merge pull request #779 from sivapvarma:master
Andrey Kamaev [Fri, 5 Apr 2013 15:52:42 +0000 (19:52 +0400)]
Merge branch '2.4'
Siva Prasad Varma [Fri, 5 Apr 2013 09:02:07 +0000 (14:32 +0530)]
Add HoughTransform examples python2
houghlines.py for HoughLinesP() and HoughLines()
houghcircles.py for HoughCircles()
Andrey Kamaev [Fri, 5 Apr 2013 09:00:20 +0000 (13:00 +0400)]
Merge pull request #778 from asmorkalov:android_wanr_fix
Andrey Kamaev [Fri, 5 Apr 2013 09:00:03 +0000 (13:00 +0400)]
Merge pull request #777 from taka-no-me:ocl_win_hang
Andrey Kamaev [Fri, 5 Apr 2013 08:59:45 +0000 (12:59 +0400)]
Merge pull request #775 from bitwangyaoyao:2.4_fixerr
Andrey Kamaev [Fri, 5 Apr 2013 08:59:22 +0000 (12:59 +0400)]
Merge pull request #771 from gpsinghsandhu:surfFeatureFinder
Andrey Kamaev [Fri, 5 Apr 2013 08:59:01 +0000 (12:59 +0400)]
Merge pull request #769 from apavlenko:fix_2901
Alexander Smorkalov [Fri, 5 Apr 2013 08:17:45 +0000 (12:17 +0400)]
Waning fixes for Android samples
Andrey Kamaev [Fri, 5 Apr 2013 07:46:06 +0000 (11:46 +0400)]
Merge pull request #772 from gpsinghsandhu:featureDescriptionTutorials
Andrey Kamaev [Fri, 5 Apr 2013 07:01:28 +0000 (11:01 +0400)]
Workaround hanging of ocl module when ocl API in not really used
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:37 +0000 (08:50 +0400)]
fix for #2901 (en exception was raised when getting empty MatOfDMatch)
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:24 +0000 (08:50 +0400)]
test for the issue #2901
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:08 +0000 (08:50 +0400)]
copying '.classpath' and '.project' to build dir, useful for opening in eclipse
yao [Fri, 5 Apr 2013 00:15:05 +0000 (08:15 +0800)]
fix all redefine build errors on some Intel OCL
Gurpinder Singh Sandhu [Thu, 4 Apr 2013 17:43:03 +0000 (23:13 +0530)]
another update
Gurpinder Singh Sandhu [Thu, 4 Apr 2013 17:42:18 +0000 (23:12 +0530)]
Feature description tutorials made in sync with sample code
sample code : https://github.com/Itseez/opencv/blob/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
Bug #2888
Gurpinder Singh Sandhu [Thu, 4 Apr 2013 17:24:27 +0000 (22:54 +0530)]
some typo
Gurpinder Singh Sandhu [Thu, 4 Apr 2013 17:22:07 +0000 (22:52 +0530)]
changed surfFeaturesFinder::find() to allow CV_8UC1 type images
http://code.opencv.org/issues/2926
Andrey Kamaev [Thu, 4 Apr 2013 16:01:55 +0000 (20:01 +0400)]
Merge pull request #770 from asmorkalov:winrt
Andrey Kamaev [Thu, 4 Apr 2013 14:44:34 +0000 (18:44 +0400)]
Merge pull request #760 from alekcac:2.4
Alexander Smorkalov [Thu, 4 Apr 2013 06:11:33 +0000 (23:11 -0700)]
Build warning fixes.
Andrey Kamaev [Thu, 4 Apr 2013 14:16:15 +0000 (18:16 +0400)]
Merge pull request #763 from gpsinghsandhu:video-doc-minor-typo
Andrey Kamaev [Thu, 4 Apr 2013 14:15:03 +0000 (18:15 +0400)]
Merge pull request #757 from jackculpepper:master
Andrey Kamaev [Thu, 4 Apr 2013 14:00:43 +0000 (18:00 +0400)]
Merge pull request #767 from asmorkalov:version_increment
Andrey Kamaev [Thu, 4 Apr 2013 14:00:22 +0000 (18:00 +0400)]
Merge pull request #766 from taka-no-me:try_compile_fix
Andrey Kamaev [Thu, 4 Apr 2013 13:59:57 +0000 (17:59 +0400)]
Merge pull request #764 from taka-no-me:svd
Andrey Kamaev [Thu, 4 Apr 2013 13:59:27 +0000 (17:59 +0400)]
Merge pull request #762 from vpisarev:cvt_fix
Andrey Kamaev [Thu, 4 Apr 2013 13:58:44 +0000 (17:58 +0400)]
Merge pull request #759 from asmorkalov:android_common_fixes
Andrey Kamaev [Thu, 4 Apr 2013 13:57:37 +0000 (17:57 +0400)]
Merge pull request #758 from taka-no-me:do_not_use_opengl_without_ui
Andrey Kamaev [Thu, 4 Apr 2013 13:57:16 +0000 (17:57 +0400)]
Merge pull request #756 from taka-no-me:libavcodec53.25.0
Andrey Kamaev [Thu, 4 Apr 2013 13:56:52 +0000 (17:56 +0400)]
Merge pull request #755 from taka-no-me:add_checkinclude
Andrey Kamaev [Thu, 4 Apr 2013 13:55:27 +0000 (17:55 +0400)]
Merge pull request #753 from taka-no-me:fix_osx_fat_java
Alexander Smorkalov [Thu, 4 Apr 2013 11:50:36 +0000 (15:50 +0400)]
OpenCV verison incremented
OpenCV Manager verison incremeneted;
Docs and tests updated accordingly;
COnstant for Manager initialization added.
Andrey Kamaev [Thu, 4 Apr 2013 11:43:49 +0000 (15:43 +0400)]
Fix binary directory used in CMake try_compile commands
Old paths can have problems with cross-compilation
Alexander Shishkov [Thu, 4 Apr 2013 10:33:00 +0000 (14:33 +0400)]
removed willowgarage.com links
gpsinghsandhu [Thu, 4 Apr 2013 10:28:11 +0000 (15:58 +0530)]
minor typo in the research paper title
Vadim Pisarevsky [Thu, 4 Apr 2013 10:27:11 +0000 (14:27 +0400)]
attempt to fix stereobm failures on Mac and Linux
Andrey Kamaev [Thu, 4 Apr 2013 09:55:36 +0000 (13:55 +0400)]
SVD: always update W vector for better algorithm convergency
Alexander Shishkov [Thu, 4 Apr 2013 09:44:28 +0000 (13:44 +0400)]
removed links to the opencv.willowgarage.com/
Alexander Smorkalov [Thu, 4 Apr 2013 08:18:13 +0000 (12:18 +0400)]
Several fixes android related fixes
Native activity build warning fixed;
Logcat messages for JavaCameraView updated (Bug #2876);
Some fixes for feature #2893 done.
Andrey Kamaev [Thu, 4 Apr 2013 07:57:00 +0000 (11:57 +0400)]
Improve CMake checks for the OpenGL availability
Issue #2868
jackculpepper [Thu, 4 Apr 2013 07:51:52 +0000 (00:51 -0700)]
mark multiple return arguments for python bindings
Andrey Kamaev [Thu, 4 Apr 2013 07:27:43 +0000 (11:27 +0400)]
Fix ffmpeg wrapper compatibility with libavcodec > 53.25.0
Based on pull request #685
Andrey Kamaev [Thu, 4 Apr 2013 07:04:51 +0000 (11:04 +0400)]
Add missed CMake include for check_include_file
Issue #2820
Andrey Kamaev [Wed, 3 Apr 2013 20:57:33 +0000 (00:57 +0400)]
Merge pull request #752 from khzimmer:2.4
Andrey Kamaev [Wed, 3 Apr 2013 20:56:10 +0000 (00:56 +0400)]
Merge pull request #749 from taka-no-me:mingw64
Andrey Kamaev [Wed, 3 Apr 2013 20:55:21 +0000 (00:55 +0400)]
Merge pull request #747 from taka-no-me:split_c_cpp
Andrey Kamaev [Wed, 3 Apr 2013 20:55:03 +0000 (00:55 +0400)]
Merge pull request #744 from pengx17:Branch_2.4_stereobp_ocl
Andrey Kamaev [Wed, 3 Apr 2013 16:02:13 +0000 (20:02 +0400)]
Fix link of fat java wrapper on OS X
Karl-Heinz Zimmer [Wed, 3 Apr 2013 15:54:29 +0000 (17:54 +0200)]
Set ptr to NULL, so this method can be called repeatedly. This fixes a crash after unplugging web cam and trying to re-scan the cameras.
Andrey Kamaev [Wed, 3 Apr 2013 13:25:00 +0000 (17:25 +0400)]
Fix findEssentialMat function
Also remove all usages of std::complex from OpenCV modules
Andrey Kamaev [Wed, 3 Apr 2013 12:30:33 +0000 (16:30 +0400)]
Fix target platform detection for x64 MinGW
Andrey Kamaev [Wed, 3 Apr 2013 11:58:47 +0000 (15:58 +0400)]
Merge pull request #746 from jet47:fix-gpu-compilation
Andrey Kamaev [Wed, 3 Apr 2013 11:58:31 +0000 (15:58 +0400)]
Merge pull request #737 from AoD314:webp2
Andrey Kamaev [Wed, 3 Apr 2013 11:58:17 +0000 (15:58 +0400)]
Merge pull request #722 from gpsinghsandhu:blob-detector-cpp
Andrey Kamaev [Wed, 3 Apr 2013 11:44:46 +0000 (15:44 +0400)]
Merge pull request #745 from jet47:fix-gpu-warnings
Andrey Kamaev [Wed, 3 Apr 2013 11:39:57 +0000 (15:39 +0400)]
Merge pull request #716 from asmorkalov:winrt
Andrey Kamaev [Wed, 3 Apr 2013 11:21:09 +0000 (15:21 +0400)]
Merge pull request #748 from asmorkalov:android_na_install_fix
Andrey Kamaev [Wed, 3 Apr 2013 11:18:11 +0000 (15:18 +0400)]
Merge pull request #743 from jet47:fix-sparsemat-iterator
Andrey Kamaev [Wed, 3 Apr 2013 11:17:53 +0000 (15:17 +0400)]
Merge pull request #738 from jet47:gpu-disable-videoenc-test
Andrey Kamaev [Wed, 3 Apr 2013 11:17:37 +0000 (15:17 +0400)]
Merge pull request #728 from taka-no-me:ndk-r8e
projects / platform / upstream / opencv.git / log