platform/upstream/opencv.git
11 years agofix for #2901 (en exception was raised when getting empty MatOfDMatch)
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:37 +0000 (08:50 +0400)]
fix for #2901 (en exception was raised when getting empty MatOfDMatch)

11 years agotest for the issue #2901
Andrey Pavlenko [Fri, 5 Apr 2013 04:50:24 +0000 (08:50 +0400)]
test for the issue #2901

11 years agocopying '.classpath' and '.project' to build dir, useful for opening in eclipse
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

11 years agoMerge pull request #745 from jet47:fix-gpu-warnings
Andrey Kamaev [Wed, 3 Apr 2013 11:44:46 +0000 (15:44 +0400)]
Merge pull request #745 from jet47:fix-gpu-warnings

11 years agoMerge pull request #716 from asmorkalov:winrt
Andrey Kamaev [Wed, 3 Apr 2013 11:39:57 +0000 (15:39 +0400)]
Merge pull request #716 from asmorkalov:winrt

11 years agoMerge pull request #748 from asmorkalov:android_na_install_fix
Andrey Kamaev [Wed, 3 Apr 2013 11:21:09 +0000 (15:21 +0400)]
Merge pull request #748 from asmorkalov:android_na_install_fix

11 years agoMerge pull request #743 from jet47:fix-sparsemat-iterator
Andrey Kamaev [Wed, 3 Apr 2013 11:18:11 +0000 (15:18 +0400)]
Merge pull request #743 from jet47:fix-sparsemat-iterator

11 years agoMerge pull request #738 from jet47:gpu-disable-videoenc-test
Andrey Kamaev [Wed, 3 Apr 2013 11:17:53 +0000 (15:17 +0400)]
Merge pull request #738 from jet47:gpu-disable-videoenc-test

11 years agoMerge pull request #728 from taka-no-me:ndk-r8e
Andrey Kamaev [Wed, 3 Apr 2013 11:17:37 +0000 (15:17 +0400)]
Merge pull request #728 from taka-no-me:ndk-r8e

11 years agoCode review notes fixed.
Alexander Smorkalov [Wed, 3 Apr 2013 10:48:23 +0000 (03:48 -0700)]
Code review notes fixed.

11 years agoNative activity install fixed.
Alexander Smorkalov [Wed, 3 Apr 2013 10:43:23 +0000 (14:43 +0400)]
Native activity install fixed.

11 years agofixed compilation warning for CUDA files
Vladislav Vinogradov [Wed, 3 Apr 2013 09:29:04 +0000 (13:29 +0400)]
fixed compilation warning for CUDA files

command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]

11 years agofixed SparseMat Iterator compilation error (bug #2921)
Vladislav Vinogradov [Wed, 3 Apr 2013 08:39:03 +0000 (12:39 +0400)]
fixed SparseMat Iterator compilation error (bug #2921)

11 years agoExperimental MS Media Foundation API support added
Alexander Smorkalov [Wed, 3 Apr 2013 01:01:20 +0000 (18:01 -0700)]
Experimental MS Media Foundation API support added

11 years agodisabled perf tests for gpu VideoWriter and VideoReader
Vladislav Vinogradov [Tue, 2 Apr 2013 12:49:09 +0000 (16:49 +0400)]
disabled perf tests for gpu VideoWriter and VideoReader

11 years agoMerge pull request #736 from bitwangyaoyao:2.4_clflush
Andrey Kamaev [Tue, 2 Apr 2013 11:25:19 +0000 (15:25 +0400)]
Merge pull request #736 from bitwangyaoyao:2.4_clflush

11 years agoMerge pull request #735 from jet47:fix-windows-issues
Andrey Kamaev [Tue, 2 Apr 2013 11:25:06 +0000 (15:25 +0400)]
Merge pull request #735 from jet47:fix-windows-issues

11 years agoMerge pull request #734 from apavlenko:fix_2806
Andrey Kamaev [Tue, 2 Apr 2013 11:24:53 +0000 (15:24 +0400)]
Merge pull request #734 from apavlenko:fix_2806

11 years agoMerge pull request #732 from apavlenko:disable_unstable_test
Andrey Kamaev [Tue, 2 Apr 2013 11:24:40 +0000 (15:24 +0400)]
Merge pull request #732 from apavlenko:disable_unstable_test

11 years agoMerge pull request #731 from bitwangyaoyao:2.4_fixDft
Andrey Kamaev [Tue, 2 Apr 2013 11:24:25 +0000 (15:24 +0400)]
Merge pull request #731 from bitwangyaoyao:2.4_fixDft

11 years agoMerge pull request #730 from vpisarev:ba_fix
Andrey Kamaev [Tue, 2 Apr 2013 11:24:12 +0000 (15:24 +0400)]
Merge pull request #730 from vpisarev:ba_fix

11 years agofixed nonfree test (run it only on one gpu device)
Vladislav Vinogradov [Tue, 2 Apr 2013 09:24:39 +0000 (13:24 +0400)]
fixed nonfree test (run it only on one gpu device)

11 years agofixed warnings
Vladislav Vinogradov [Tue, 2 Apr 2013 09:24:00 +0000 (13:24 +0400)]
fixed warnings

11 years agofixed assert condition (trueRightDisp can be empty)
Vladislav Vinogradov [Tue, 2 Apr 2013 09:23:03 +0000 (13:23 +0400)]
fixed assert condition (trueRightDisp can be empty)

11 years agofix for #2806 (missing 'nu03' field of moments)
Andrey Pavlenko [Tue, 2 Apr 2013 08:14:43 +0000 (12:14 +0400)]
fix for #2806 (missing 'nu03' field of moments)

11 years agothis test is unstable (fails from time to time), let's disable it until fixed
Andrey Pavlenko [Tue, 2 Apr 2013 07:39:26 +0000 (11:39 +0400)]
this test is unstable (fails from time to time), let's disable it until fixed

11 years agouse clflush replaces clfinish
yao [Tue, 2 Apr 2013 06:41:02 +0000 (14:41 +0800)]
use clflush replaces clfinish

11 years agofix the crash when calling dft
yao [Tue, 2 Apr 2013 03:35:40 +0000 (11:35 +0800)]
fix the crash when calling dft

11 years agofixes in bundle adjustment code by Nils Hasler
Vadim Pisarevsky [Mon, 1 Apr 2013 11:20:35 +0000 (15:20 +0400)]
fixes in bundle adjustment code by Nils Hasler

11 years agoUpdate Android toolchain to the latest version supporting NDK r8e
Andrey Kamaev [Mon, 1 Apr 2013 09:30:44 +0000 (13:30 +0400)]
Update Android toolchain to the latest version supporting NDK r8e

11 years agoMerge pull request #713 from bitwangyaoyao:2.4_perf
Andrey Kamaev [Mon, 1 Apr 2013 11:16:48 +0000 (15:16 +0400)]
Merge pull request #713 from bitwangyaoyao:2.4_perf

11 years agoMerge pull request #729 from jet47:fix-gpu-windows-build
Andrey Kamaev [Mon, 1 Apr 2013 11:11:40 +0000 (15:11 +0400)]
Merge pull request #729 from jet47:fix-gpu-windows-build

11 years agoMerge pull request #727 from asmorkalov:android_na_cmake
Andrey Kamaev [Mon, 1 Apr 2013 11:11:25 +0000 (15:11 +0400)]
Merge pull request #727 from asmorkalov:android_na_cmake

11 years agoMerge pull request #726 from jet47:fix-pvs-studio-warnings
Andrey Kamaev [Mon, 1 Apr 2013 11:11:02 +0000 (15:11 +0400)]
Merge pull request #726 from jet47:fix-pvs-studio-warnings

11 years agoMerge pull request #725 from taka-no-me:fix_array_create
Andrey Kamaev [Mon, 1 Apr 2013 11:10:49 +0000 (15:10 +0400)]
Merge pull request #725 from taka-no-me:fix_array_create

11 years agofixed gpu module compilation under windows
Vladislav Vinogradov [Mon, 1 Apr 2013 10:15:06 +0000 (14:15 +0400)]
fixed gpu module compilation under windows

11 years agoCMakeLists.txt for Android native activity added.
Alexander Smorkalov [Mon, 1 Apr 2013 08:38:26 +0000 (12:38 +0400)]
CMakeLists.txt for Android native activity added.

11 years agofixed inconsistent new/delete operators
Vladislav Vinogradov [Mon, 1 Apr 2013 07:55:02 +0000 (11:55 +0400)]
fixed inconsistent  new/delete operators

11 years agofixed condition in KeyPointsFilter::retainBest
Vladislav Vinogradov [Mon, 1 Apr 2013 07:53:43 +0000 (11:53 +0400)]
fixed condition in KeyPointsFilter::retainBest

11 years agofixed mind/maxd search in CvFuzzyMeanShiftTracker::SearchWindow::initDepthValues
Vladislav Vinogradov [Mon, 1 Apr 2013 07:53:05 +0000 (11:53 +0400)]
fixed mind/maxd search in CvFuzzyMeanShiftTracker::SearchWindow::initDepthValues

11 years agofixed incorrect sizeof() expression in CvCalibFilter::SetCameraCount
Vladislav Vinogradov [Mon, 1 Apr 2013 07:37:48 +0000 (11:37 +0400)]
fixed incorrect sizeof() expression in CvCalibFilter::SetCameraCount

11 years agofixed incorrect sizeof() expression in CvCaptureCAM_VFW::open
Vladislav Vinogradov [Mon, 1 Apr 2013 07:35:33 +0000 (11:35 +0400)]
fixed incorrect sizeof() expression in CvCaptureCAM_VFW::open

11 years agofixed potential dereference of null pointer
Vladislav Vinogradov [Mon, 1 Apr 2013 07:31:56 +0000 (11:31 +0400)]
fixed potential dereference of null pointer

11 years agoremoved duplication
Vladislav Vinogradov [Mon, 1 Apr 2013 07:29:13 +0000 (11:29 +0400)]
removed duplication

11 years agofixed misprint in imgwarp.cpp
Vladislav Vinogradov [Mon, 1 Apr 2013 07:26:49 +0000 (11:26 +0400)]
fixed misprint in imgwarp.cpp

11 years agofixed misprint in icvCreateIsometricImage
Vladislav Vinogradov [Mon, 1 Apr 2013 07:23:27 +0000 (11:23 +0400)]
fixed misprint in icvCreateIsometricImage

11 years agoremoved unnecessary tmp variable (convertTo can work in-place)
Vladislav Vinogradov [Mon, 1 Apr 2013 07:18:30 +0000 (11:18 +0400)]
removed unnecessary tmp variable (convertTo can work in-place)

11 years agofixed misprint in MatOp::augAssignXor
Vladislav Vinogradov [Mon, 1 Apr 2013 07:16:47 +0000 (11:16 +0400)]
fixed misprint in MatOp::augAssignXor

11 years agoMerge pull request #721 from jet47:tvl1-bug-fix
Andrey Kamaev [Sun, 31 Mar 2013 09:46:23 +0000 (13:46 +0400)]
Merge pull request #721 from jet47:tvl1-bug-fix

11 years agoMerge pull request #723 from virtuald:2.4
Andrey Kamaev [Sun, 31 Mar 2013 09:45:55 +0000 (13:45 +0400)]
Merge pull request #723 from virtuald:2.4

11 years agoFix typo leading to heap corruption in OutputArray::create
Andrey Kamaev [Sun, 31 Mar 2013 09:40:09 +0000 (13:40 +0400)]
Fix typo leading to heap corruption in OutputArray::create

11 years agoPort dft.py sample from cv to cv2
Dustin Spicuzza [Fri, 29 Mar 2013 21:37:00 +0000 (17:37 -0400)]
Port dft.py sample from cv to cv2

11 years agoFix ant/Java detection in cmake scripts
Misty De Meo [Fri, 22 Mar 2013 16:18:42 +0000 (11:18 -0500)]
Fix ant/Java detection in cmake scripts

Mac OS X 10.7 and newer don't come with Java installed. They do
include some stub binaries, which ask the user if they want to
install Java when run.

OpenCV's cmake script just checks for the existence of an ant
binary and assumes that Java's available if ant is. As a result,
cmake will configure the build to use Java and it will fail once
it tries to compile the Java bindings.

This fixes the issue by checking for the exit status of
`ant -version` - it exits 0 if Java is installed, or 1
otherwise.(cherry picked from commit a423afddc143f4b10e09e7b253a420b29f877b6c)

11 years agoUpdate operations_on_arrays.rst
Ryan Rawson [Wed, 27 Mar 2013 09:52:53 +0000 (02:52 -0700)]
Update operations_on_arrays.rst

Remove weirdo unicode – and just use a normal -(cherry picked from commit 0d49de51b79eacccf5b93a6fa67478a59ffd246d)

11 years agoMerge pull request #718 from apavlenko:java_tests_fix
Andrey Kamaev [Fri, 29 Mar 2013 14:21:14 +0000 (18:21 +0400)]
Merge pull request #718 from apavlenko:java_tests_fix

11 years agoMerge pull request #707 from pengx17:2.4_surf
Andrey Kamaev [Fri, 29 Mar 2013 14:20:45 +0000 (18:20 +0400)]
Merge pull request #707 from pengx17:2.4_surf

11 years agoMerge pull request #704 from taka-no-me:folders
Andrey Kamaev [Fri, 29 Mar 2013 14:20:26 +0000 (18:20 +0400)]
Merge pull request #704 from taka-no-me:folders

11 years agofixed bug in TVL1 optical flow:
Vladislav Vinogradov [Fri, 29 Mar 2013 06:40:28 +0000 (10:40 +0400)]
fixed bug in TVL1 optical flow:

initial optical flow was not cleaned during the second call

11 years agoPerf tests for Video IO on WInRT fixed.
Alexander Smorkalov [Thu, 28 Mar 2013 07:01:52 +0000 (00:01 -0700)]
Perf tests for Video IO on WInRT fixed.

11 years agoHAVE_WIN32UI and HAVE_VFW checks and defines added.
Alexander Smorkalov [Wed, 27 Mar 2013 15:03:51 +0000 (08:03 -0700)]
HAVE_WIN32UI and HAVE_VFW checks and defines added.

11 years agoFix for encoding errors when building Java source
Alexander Bohn / FI$H2k [Fri, 15 Mar 2013 09:47:52 +0000 (06:47 -0300)]
Fix for encoding errors when building Java source

The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
(cherry picked from commit f3ee55e04222deea30ffe4e89456c220bc75ff1a)

11 years agoMerge pull request #715 from pengx17:2.4_canny_buf
Andrey Kamaev [Wed, 27 Mar 2013 09:19:40 +0000 (13:19 +0400)]
Merge pull request #715 from pengx17:2.4_canny_buf

11 years agoMerge pull request #712 from apavlenko:fix-2912
Andrey Kamaev [Wed, 27 Mar 2013 09:19:27 +0000 (13:19 +0400)]
Merge pull request #712 from apavlenko:fix-2912

11 years agoVideo IO tests turned off for ARM WinRT.
Alexander Smorkalov [Wed, 27 Mar 2013 07:23:23 +0000 (00:23 -0700)]
Video IO tests turned off for ARM WinRT.

11 years agoFix OCL Canny
peng xiao [Wed, 27 Mar 2013 07:08:51 +0000 (15:08 +0800)]
Fix OCL Canny

11 years agoDisable ocl::SURF accurate test
peng xiao [Wed, 27 Mar 2013 05:25:08 +0000 (13:25 +0800)]
Disable ocl::SURF accurate test

11 years agouse perf test replace performance sample
yao [Wed, 27 Mar 2013 04:04:48 +0000 (12:04 +0800)]
use perf test replace performance sample

11 years agoFix compiler errors
peng xiao [Wed, 27 Mar 2013 00:56:31 +0000 (08:56 +0800)]
Fix compiler errors

11 years agoMultiple fixes for WinRT
Alexander Smorkalov [Wed, 27 Mar 2013 00:19:52 +0000 (17:19 -0700)]
Multiple fixes for WinRT

Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;

11 years agofix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
Andrey Pavlenko [Tue, 26 Mar 2013 15:31:16 +0000 (19:31 +0400)]
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)

11 years agoMerge pull request #705 from bitwangyaoyao:2.4_oclFix
Andrey Kamaev [Tue, 26 Mar 2013 14:38:36 +0000 (18:38 +0400)]
Merge pull request #705 from bitwangyaoyao:2.4_oclFix

11 years agoMerge pull request #710 from jet47:gpu-fix-compilation-issues
Andrey Kamaev [Tue, 26 Mar 2013 11:31:22 +0000 (15:31 +0400)]
Merge pull request #710 from jet47:gpu-fix-compilation-issues

11 years agoFix compiler errors
peng xiao [Tue, 26 Mar 2013 09:23:38 +0000 (17:23 +0800)]
Fix compiler errors

11 years agoFix compiler errors
peng xiao [Tue, 26 Mar 2013 08:40:30 +0000 (16:40 +0800)]
Fix compiler errors

11 years agofixed compilation issues with gpu modules:
Vladislav Vinogradov [Tue, 26 Mar 2013 08:33:13 +0000 (12:33 +0400)]
fixed compilation issues with gpu modules:

* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows

11 years agoPass warp size into SURF
peng xiao [Tue, 26 Mar 2013 07:48:15 +0000 (15:48 +0800)]
Pass warp size into SURF

11 years agoAdd a function to query ocl device info
peng xiao [Tue, 26 Mar 2013 07:36:49 +0000 (15:36 +0800)]
Add a function to query ocl device info

Currently the function only supports wavefront size query

11 years agomore fix
yao [Tue, 26 Mar 2013 06:23:26 +0000 (14:23 +0800)]
more fix

11 years agomore fix of mismatch
yao [Tue, 26 Mar 2013 06:10:29 +0000 (14:10 +0800)]
more fix of mismatch

11 years agomore fix of mismatch functions on CPU OCL
yao [Tue, 26 Mar 2013 05:41:13 +0000 (13:41 +0800)]
more fix of mismatch functions on CPU OCL

11 years agofix some mismatch
yao [Tue, 26 Mar 2013 05:05:01 +0000 (13:05 +0800)]
fix some mismatch

11 years agodiscard comments in kernels.cpp
yao [Tue, 26 Mar 2013 04:01:01 +0000 (12:01 +0800)]
discard comments in kernels.cpp

11 years agoAdd a macro to call additional barrier function on the fly
peng xiao [Tue, 26 Mar 2013 03:51:02 +0000 (11:51 +0800)]
Add a macro to call additional barrier function on the fly

11 years agofix amdFft and amdBlas path
yao [Tue, 26 Mar 2013 03:48:14 +0000 (11:48 +0800)]
fix amdFft and amdBlas path

11 years agoDrop outdated targets and fix solution folders
Andrey Kamaev [Mon, 25 Mar 2013 17:57:53 +0000 (21:57 +0400)]
Drop outdated targets and fix solution folders

11 years agoMerge pull request #701 from jet47:clahe
Andrey Kamaev [Mon, 25 Mar 2013 16:26:22 +0000 (20:26 +0400)]
Merge pull request #701 from jet47:clahe

11 years agoGPU implementation of CLAHE
Vladislav Vinogradov [Mon, 25 Mar 2013 11:39:07 +0000 (15:39 +0400)]
GPU implementation of CLAHE

11 years agoCPU implementation of CLAHE
Vladislav Vinogradov [Mon, 25 Mar 2013 11:38:43 +0000 (15:38 +0400)]
CPU implementation of CLAHE

11 years agoMerge pull request #698 from vpisarev/ms_visimage_tut24
Andrey Kamaev [Mon, 25 Mar 2013 10:29:13 +0000 (03:29 -0700)]
Merge pull request #698 from vpisarev/ms_visimage_tut24

added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio

11 years agoMerge pull request #697 from Nerei/ios_png_jpeg
Andrey Kamaev [Mon, 25 Mar 2013 10:28:29 +0000 (03:28 -0700)]
Merge pull request #697 from Nerei/ios_png_jpeg

Enabled png and jpeg for iOS

11 years agoenabled png and jpeg for iOS
Anatoly Baksheev [Sun, 24 Mar 2013 16:07:55 +0000 (20:07 +0400)]
enabled png and jpeg for iOS

11 years agoadded tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
Vadim Pisarevsky [Sun, 24 Mar 2013 19:48:35 +0000 (23:48 +0400)]
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio

11 years agoMerge pull request #691 from vpisarev:fix_2899
Andrey Kamaev [Fri, 22 Mar 2013 13:18:54 +0000 (17:18 +0400)]
Merge pull request #691 from vpisarev:fix_2899

11 years agoMerge pull request #688 from jet47:fix-nonfree-compilation
Andrey Kamaev [Fri, 22 Mar 2013 13:18:40 +0000 (17:18 +0400)]
Merge pull request #688 from jet47:fix-nonfree-compilation

11 years agoMerge pull request #683 from jet47:gpu-license
Andrey Kamaev [Fri, 22 Mar 2013 13:18:14 +0000 (17:18 +0400)]
Merge pull request #683 from jet47:gpu-license

11 years agoremoved extra whitespaces
Vadim Pisarevsky [Fri, 22 Mar 2013 11:12:55 +0000 (15:12 +0400)]
removed extra whitespaces

11 years agofixed http://code.opencv.org/issues/2899
Vadim Pisarevsky [Fri, 22 Mar 2013 11:10:54 +0000 (15:10 +0400)]
fixed http://code.opencv.org/issues/2899

11 years agoMerge pull request #687 from vpisarev:fast_lin_svm2
Vadim Pisarevsky [Fri, 22 Mar 2013 10:34:44 +0000 (14:34 +0400)]
Merge pull request #687 from vpisarev:fast_lin_svm2

11 years agoupdated license header in whole gpu module
Vladislav Vinogradov [Thu, 21 Mar 2013 09:31:51 +0000 (13:31 +0400)]
updated license header in whole gpu module

11 years agofixed nonfree compilation with gpu (perf tests)
Vladislav Vinogradov [Fri, 22 Mar 2013 06:20:50 +0000 (10:20 +0400)]
fixed nonfree compilation with gpu (perf tests)