platform/upstream/opencv.git
11 years agoMerge pull request #1153 from abidrahmank:bgdGMG_docs
Roman Donchenko [Mon, 22 Jul 2013 10:52:35 +0000 (14:52 +0400)]
Merge pull request #1153 from abidrahmank:bgdGMG_docs

11 years agoMerge pull request #1155 from bitwangyaoyao:master_fix
Andrey Pavlenko [Sun, 21 Jul 2013 14:50:38 +0000 (18:50 +0400)]
Merge pull request #1155 from bitwangyaoyao:master_fix

11 years agoMerge pull request #1122 from SpecLad:merge-2.4
Andrey Pavlenko [Sun, 21 Jul 2013 14:46:26 +0000 (18:46 +0400)]
Merge pull request #1122 from SpecLad:merge-2.4

11 years agoMerge pull request #1032 from jet47:gpuarithm-remove-obsolete-api
Andrey Pavlenko [Sun, 21 Jul 2013 14:45:46 +0000 (18:45 +0400)]
Merge pull request #1032 from jet47:gpuarithm-remove-obsolete-api

11 years agobgdsubtractorGMG docs
abidrahmank [Fri, 19 Jul 2013 17:41:30 +0000 (23:11 +0530)]
bgdsubtractorGMG docs

11 years agoMerge pull request #1133 from abidrahmank:denoising_pydocs
Roman Donchenko [Fri, 19 Jul 2013 08:20:56 +0000 (12:20 +0400)]
Merge pull request #1133 from abidrahmank:denoising_pydocs

11 years agoWarning fixes
yao [Fri, 19 Jul 2013 06:36:41 +0000 (14:36 +0800)]
Warning fixes

11 years agoMerge pull request #1095 from jet47:gpu-perf-tests
Andrey Pavlenko [Thu, 18 Jul 2013 15:32:37 +0000 (19:32 +0400)]
Merge pull request #1095 from jet47:gpu-perf-tests

11 years agoMerge pull request #1144 from prclibo:master
Roman Donchenko [Thu, 18 Jul 2013 12:05:39 +0000 (16:05 +0400)]
Merge pull request #1144 from prclibo:master

11 years agoMerge pull request #1042 from jet47:gpuimgproc-refactoring
Andrey Pavlenko [Thu, 18 Jul 2013 10:22:44 +0000 (14:22 +0400)]
Merge pull request #1042 from jet47:gpuimgproc-refactoring

11 years agoremoved tab in five-point.cpp
Bo Li [Thu, 18 Jul 2013 02:09:50 +0000 (10:09 +0800)]
removed tab in five-point.cpp

11 years agofixed a bug for the mask of recoverPose function
Bo Li [Thu, 18 Jul 2013 01:55:39 +0000 (09:55 +0800)]
fixed a bug for the mask of recoverPose function

11 years agoMerge pull request #1132 from apavlenko:master_ver_290
Roman Donchenko [Wed, 17 Jul 2013 13:51:55 +0000 (17:51 +0400)]
Merge pull request #1132 from apavlenko:master_ver_290

11 years agomoving version to 2.9.0,
Andrey Pavlenko [Wed, 17 Jul 2013 11:03:11 +0000 (15:03 +0400)]
moving version to 2.9.0,
also adding NVidia copyright

11 years agoMerge pull request #1124 from SpecLad:matx-div
Roman Donchenko [Wed, 17 Jul 2013 09:32:26 +0000 (13:32 +0400)]
Merge pull request #1124 from SpecLad:matx-div

11 years agoMerge pull request #1093 from jet47:fix-gpu-stream-test
Roman Donchenko [Wed, 17 Jul 2013 09:18:25 +0000 (13:18 +0400)]
Merge pull request #1093 from jet47:fix-gpu-stream-test

11 years agofixed compilation
Vladislav Vinogradov [Mon, 24 Jun 2013 12:19:37 +0000 (16:19 +0400)]
fixed compilation

11 years agoremoved obsolete API
Vladislav Vinogradov [Mon, 24 Jun 2013 10:32:45 +0000 (14:32 +0400)]
removed obsolete API

11 years agomade dependecy from gpufilters optional
Vladislav Vinogradov [Mon, 6 May 2013 11:33:32 +0000 (15:33 +0400)]
made dependecy from gpufilters optional

11 years agosplit hough sources
Vladislav Vinogradov [Mon, 6 May 2013 11:21:31 +0000 (15:21 +0400)]
split hough sources

11 years agoremoved dependecy from gpuarithm
Vladislav Vinogradov [Mon, 6 May 2013 11:21:11 +0000 (15:21 +0400)]
removed dependecy from gpuarithm

11 years agoupdated documentation
Vladislav Vinogradov [Mon, 6 May 2013 09:36:52 +0000 (13:36 +0400)]
updated documentation

11 years agoswitched to Input/Output Array in bilateralFilter & blendLinear
Vladislav Vinogradov [Mon, 6 May 2013 06:58:09 +0000 (10:58 +0400)]
switched to Input/Output Array in  bilateralFilter & blendLinear

11 years agorefactored gpu::matchTemplate (converted it into Algorithm)
Vladislav Vinogradov [Tue, 30 Apr 2013 13:27:06 +0000 (17:27 +0400)]
refactored gpu::matchTemplate (converted it into Algorithm)

11 years agoswitched to Input/Output Array in Mean Shift
Vladislav Vinogradov [Tue, 30 Apr 2013 12:29:23 +0000 (16:29 +0400)]
switched to Input/Output Array in  Mean Shift

11 years agorefactored GoodFeaturesToTrackDetector
Vladislav Vinogradov [Tue, 30 Apr 2013 12:07:56 +0000 (16:07 +0400)]
refactored GoodFeaturesToTrackDetector

11 years agorefactored cornerHarris and cornerMinEigenVal
Vladislav Vinogradov [Tue, 30 Apr 2013 11:00:25 +0000 (15:00 +0400)]
refactored cornerHarris and cornerMinEigenVal

* converted it into Algorithm

11 years agorefactored gpu::GeneralizedHough
Vladislav Vinogradov [Tue, 30 Apr 2013 09:59:10 +0000 (13:59 +0400)]
refactored gpu::GeneralizedHough

11 years agorefactored HoughCircles (converted it into Algorithm)
Vladislav Vinogradov [Tue, 30 Apr 2013 09:33:44 +0000 (13:33 +0400)]
refactored HoughCircles (converted it into Algorithm)

11 years agorefactored HoughLines (converted it into Algorithm)
Vladislav Vinogradov [Tue, 30 Apr 2013 08:51:33 +0000 (12:51 +0400)]
refactored HoughLines (converted it into Algorithm)

11 years agorefactored gpu::Canny (converted it into Algorithm)
Vladislav Vinogradov [Tue, 30 Apr 2013 07:47:33 +0000 (11:47 +0400)]
refactored gpu::Canny (converted it into Algorithm)

11 years agoswitched to Input/Output Array in Histogram Processing
Vladislav Vinogradov [Tue, 30 Apr 2013 06:59:13 +0000 (10:59 +0400)]
switched to Input/Output Array in Histogram Processing

11 years agoswitched to Input/Output Array in Color Processing
Vladislav Vinogradov [Mon, 29 Apr 2013 14:01:57 +0000 (18:01 +0400)]
switched to Input/Output Array in Color Processing

11 years agofixed gpu performance tests:
Vladislav Vinogradov [Tue, 16 Jul 2013 11:43:04 +0000 (15:43 +0400)]
fixed gpu performance tests:

used new CV_PERF_TEST_MAIN_WITH_IMPLS mechanism

11 years agoMerge pull request #1125 from SpecLad:softcascade-nowarn
Roman Donchenko [Tue, 16 Jul 2013 11:12:25 +0000 (15:12 +0400)]
Merge pull request #1125 from SpecLad:softcascade-nowarn

11 years agoFixed a build warning in softcascade.
Roman Donchenko [Tue, 16 Jul 2013 08:43:49 +0000 (12:43 +0400)]
Fixed a build warning in softcascade.

11 years agoChanged / for Matx to Matx::div, for symmetry with Matx::mul.
Roman Donchenko [Tue, 16 Jul 2013 08:25:26 +0000 (12:25 +0400)]
Changed / for Matx to Matx::div, for symmetry with Matx::mul.

11 years agoMerge pull request #984 from albenoit:master
Roman Donchenko [Tue, 16 Jul 2013 07:57:51 +0000 (11:57 +0400)]
Merge pull request #984 from albenoit:master

11 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 15 Jul 2013 14:40:54 +0000 (18:40 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp

11 years agoupdated doc wrt new bioinspired namespace convention
alexandre benoit [Mon, 15 Jul 2013 07:58:16 +0000 (09:58 +0200)]
updated doc wrt new bioinspired namespace convention

11 years agoMerge pull request #979 from jet47:gpuwarping-refactoring
Roman Donchenko [Mon, 15 Jul 2013 07:47:02 +0000 (11:47 +0400)]
Merge pull request #979 from jet47:gpuwarping-refactoring

11 years agoMerge pull request #1068 from AoD314:webp2
Roman Donchenko [Mon, 15 Jul 2013 07:45:28 +0000 (11:45 +0400)]
Merge pull request #1068 from AoD314:webp2

11 years agoMerge pull request #1049 from pengx17:2.4_superres_ocl
Roman Donchenko [Mon, 15 Jul 2013 07:43:08 +0000 (11:43 +0400)]
Merge pull request #1049 from pengx17:2.4_superres_ocl

11 years agoretina included in namespace bioinspired + followed suggestions made by Vadim
alexandre benoit [Sun, 14 Jul 2013 17:28:37 +0000 (19:28 +0200)]
retina included in namespace bioinspired + followed suggestions made by Vadim

11 years agopython docs for non-local means denoising
abidrahmank [Sat, 13 Jul 2013 10:30:15 +0000 (16:00 +0530)]
python docs for non-local means denoising

11 years agoupdated webp to version 0.3.1
andrey.morozov [Sat, 29 Jun 2013 18:01:02 +0000 (22:01 +0400)]
updated webp to version 0.3.1

11 years agoadded support image with alpha channel
andrey.morozov [Sat, 29 Jun 2013 18:00:26 +0000 (22:00 +0400)]
added support image with alpha channel

11 years agoMerge pull request #1107 from abidrahmank:master
Roman Donchenko [Fri, 12 Jul 2013 07:40:33 +0000 (11:40 +0400)]
Merge pull request #1107 from abidrahmank:master

11 years agoMerge pull request #1101 from jet47:cudev-stub-lib
Roman Donchenko [Fri, 12 Jul 2013 07:39:24 +0000 (11:39 +0400)]
Merge pull request #1101 from jet47:cudev-stub-lib

11 years agoMerge pull request #1109 from nikman-ru:cap_reuse_24x
Roman Donchenko [Fri, 12 Jul 2013 07:38:59 +0000 (11:38 +0400)]
Merge pull request #1109 from nikman-ru:cap_reuse_24x

11 years agoMerge pull request #1111 from nikman-ru:fix_yamldoc
Roman Donchenko [Fri, 12 Jul 2013 07:38:14 +0000 (11:38 +0400)]
Merge pull request #1111 from nikman-ru:fix_yamldoc

11 years agoadded stub library for cudev module
Vladislav Vinogradov [Thu, 11 Jul 2013 07:50:02 +0000 (11:50 +0400)]
added stub library for cudev module

in order to make CMake scripts work properly

11 years agofixed test compilation for gpu::Stream
Vladislav Vinogradov [Fri, 5 Jul 2013 09:18:55 +0000 (13:18 +0400)]
fixed test compilation for gpu::Stream

11 years agoremoved obsolete API from gpuarithm module
Vladislav Vinogradov [Thu, 20 Jun 2013 07:28:09 +0000 (11:28 +0400)]
removed obsolete API from gpuarithm module

11 years agoupdated documentation
Vladislav Vinogradov [Fri, 26 Apr 2013 13:23:49 +0000 (17:23 +0400)]
updated documentation

11 years agorefactored gpu::ImagePyramid (converted it to abstract interface)
Vladislav Vinogradov [Fri, 26 Apr 2013 13:18:56 +0000 (17:18 +0400)]
refactored gpu::ImagePyramid (converted it to abstract interface)

11 years agoswitched to Input/Output Array in gpuwarping functions
Vladislav Vinogradov [Fri, 26 Apr 2013 13:05:59 +0000 (17:05 +0400)]
switched to Input/Output Array in gpuwarping functions

11 years agoFixed "FileStorage (minor) error in doc (Feature #3151)"
Nikita Manovich [Thu, 11 Jul 2013 12:06:25 +0000 (16:06 +0400)]
Fixed "FileStorage (minor) error in doc (Feature #3151)"

It was just a typo in the documentation.

11 years agoFixed VideoCapture::open() does not release previous capture sources (Bug #3150).
Nikita Manovich [Wed, 10 Jul 2013 13:43:47 +0000 (17:43 +0400)]
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150).

VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
  bool VideoCapture::open(const string& filename);
  bool VideoCapture::open(int device);

The methods first call VideoCapture::release() to close the already opened file or camera.

11 years agoMerge pull request #1104 from nikman-ru:cap_reuse
Andrey Pavlenko [Thu, 11 Jul 2013 07:52:22 +0000 (11:52 +0400)]
Merge pull request #1104 from nikman-ru:cap_reuse

11 years agoMerge pull request #1106 from pengx17:2.4_gftt_rename
Andrey Pavlenko [Thu, 11 Jul 2013 07:41:37 +0000 (11:41 +0400)]
Merge pull request #1106 from pengx17:2.4_gftt_rename

11 years agoMerge pull request #1102 from SpecLad:xls-updates
Andrey Pavlenko [Thu, 11 Jul 2013 07:36:47 +0000 (11:36 +0400)]
Merge pull request #1102 from SpecLad:xls-updates

11 years agoMerge pull request #1082 from jet47:gpu-warnings-fix
Andrey Pavlenko [Thu, 11 Jul 2013 05:41:45 +0000 (09:41 +0400)]
Merge pull request #1082 from jet47:gpu-warnings-fix

11 years agoPyDocs for common interface of feature2d
abidrahmank [Thu, 11 Jul 2013 04:03:32 +0000 (09:33 +0530)]
PyDocs for common interface of feature2d

11 years agoPyDocs for FAST, ORB etc
abidrahmank [Thu, 11 Jul 2013 04:02:49 +0000 (09:32 +0530)]
PyDocs for FAST, ORB etc

11 years agofeature2d drawing functions PyDocs
abidrahmank [Thu, 11 Jul 2013 04:01:25 +0000 (09:31 +0530)]
feature2d drawing functions PyDocs

11 years agoSIFT+SURF PyDocs
abidrahmank [Thu, 11 Jul 2013 04:00:21 +0000 (09:30 +0530)]
SIFT+SURF PyDocs

11 years agodrawMatches python bindings
abidrahmank [Thu, 11 Jul 2013 03:58:37 +0000 (09:28 +0530)]
drawMatches python bindings

11 years agoMerge pull request #1077 from bitwangyaoyao:2.4_kmeans
Roman Donchenko [Wed, 10 Jul 2013 14:32:13 +0000 (18:32 +0400)]
Merge pull request #1077 from bitwangyaoyao:2.4_kmeans

11 years agoMerge pull request #1088 from apacha:brisk_noDescriptors_fix
Roman Donchenko [Wed, 10 Jul 2013 14:18:31 +0000 (18:18 +0400)]
Merge pull request #1088 from apacha:brisk_noDescriptors_fix

11 years agoMerge pull request #1080 from hhofbaue:matchTemplate_bugfix
Roman Donchenko [Wed, 10 Jul 2013 14:17:06 +0000 (18:17 +0400)]
Merge pull request #1080 from hhofbaue:matchTemplate_bugfix

11 years agoFixed VideoCapture::open() does not release previous capture sources (Bug #3150).
Nikita Manovich [Wed, 10 Jul 2013 13:43:47 +0000 (17:43 +0400)]
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150).

VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
  bool VideoCapture::open(const string& filename);
  bool VideoCapture::open(int device);

The methods first call VideoCapture::release() to close the already opened file or camera.

11 years agoMerge pull request #1103 from apavlenko:ver_2.4.6.1
Roman Donchenko [Wed, 10 Jul 2013 11:48:59 +0000 (15:48 +0400)]
Merge pull request #1103 from apavlenko:ver_2.4.6.1

11 years agosetting version to 2.4.6.1 (hot-fix release for Linux camera support)
Andrey Pavlenko [Wed, 10 Jul 2013 11:12:39 +0000 (15:12 +0400)]
setting version to 2.4.6.1 (hot-fix release for Linux camera support)

11 years agoxls-report.py: Added an option to show per-pixel times
Roman Donchenko [Wed, 10 Jul 2013 10:50:51 +0000 (14:50 +0400)]
xls-report.py: Added an option to show per-pixel times

11 years agoMade the crude ability less crude.
Roman Donchenko [Tue, 9 Jul 2013 14:57:22 +0000 (18:57 +0400)]
Made the crude ability less crude.

11 years agoAdded to the test log parser a crude ability to detect non-implemented tests.
Roman Donchenko [Fri, 5 Jul 2013 15:05:42 +0000 (19:05 +0400)]
Added to the test log parser a crude ability to detect non-implemented tests.

11 years agoxls-report.py: removed image size and type from the list of other parameters.
Roman Donchenko [Fri, 5 Jul 2013 14:41:03 +0000 (18:41 +0400)]
xls-report.py: removed image size and type from the list of other parameters.

Also, shrunk the corresponding column and the test name column.

11 years agoxls-report.py: add ability to specify arbitrary sheet properties
Roman Donchenko [Fri, 5 Jul 2013 12:10:28 +0000 (16:10 +0400)]
xls-report.py: add ability to specify arbitrary sheet properties

11 years agoFix ocl gftt file name typo.
peng xiao [Wed, 10 Jul 2013 06:51:40 +0000 (14:51 +0800)]
Fix ocl gftt file name typo.

11 years agoMerge pull request #1099 from asmorkalov:linux_vcap_fix
Roman Donchenko [Tue, 9 Jul 2013 13:13:05 +0000 (17:13 +0400)]
Merge pull request #1099 from asmorkalov:linux_vcap_fix

11 years agoV4L and V4L2 based Video capture bug fix (Bugfix #3144).
Alexander Smorkalov [Tue, 9 Jul 2013 12:07:55 +0000 (16:07 +0400)]
V4L and V4L2 based Video capture bug fix (Bugfix #3144).

11 years agoMerge pull request #1097 from apavlenko:ocl_tests_fixes
Roman Donchenko [Tue, 9 Jul 2013 10:00:38 +0000 (14:00 +0400)]
Merge pull request #1097 from apavlenko:ocl_tests_fixes

11 years agofixing working with test data and a small fix for init code
Andrey Pavlenko [Mon, 8 Jul 2013 17:12:21 +0000 (21:12 +0400)]
fixing working with test data and a small fix for init code
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!

11 years agoMerge pull request #1096 from SpecLad:merge-2.4
Roman Donchenko [Tue, 9 Jul 2013 07:50:19 +0000 (11:50 +0400)]
Merge pull request #1096 from SpecLad:merge-2.4

11 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 8 Jul 2013 14:47:38 +0000 (18:47 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp

11 years agoMerge pull request #1094 from asmorkalov:android_na_fix
Andrey Pavlenko [Mon, 8 Jul 2013 07:25:40 +0000 (11:25 +0400)]
Merge pull request #1094 from asmorkalov:android_na_fix

11 years agoadded test to save image with webp with alpha channel
andrey.morozov [Sat, 29 Jun 2013 17:59:25 +0000 (21:59 +0400)]
added test to save image with webp with alpha channel

11 years agoVarious fixes in android sample NativeActivity.
Alexander Smorkalov [Fri, 5 Jul 2013 10:08:37 +0000 (14:08 +0400)]
Various fixes in android sample NativeActivity.

11 years agoMerge pull request #1073 from asmorkalov:android_cvjavaframe
Roman Donchenko [Fri, 5 Jul 2013 09:41:51 +0000 (13:41 +0400)]
Merge pull request #1073 from asmorkalov:android_cvjavaframe

11 years agoMerge pull request #1081 from SpecLad:merge-2.4
Roman Donchenko [Fri, 5 Jul 2013 09:34:58 +0000 (13:34 +0400)]
Merge pull request #1081 from SpecLad:merge-2.4

11 years agoMerge pull request #1083 from jet47:cuda-device-layer
Roman Donchenko [Fri, 5 Jul 2013 09:30:11 +0000 (13:30 +0400)]
Merge pull request #1083 from jet47:cuda-device-layer

11 years agoMerge pull request #1074 from devernay:2.4-cap_qt-multithread
Roman Donchenko [Fri, 5 Jul 2013 09:28:38 +0000 (13:28 +0400)]
Merge pull request #1074 from devernay:2.4-cap_qt-multithread

11 years agoMerge pull request #1092 from asmorkalov:manager_version_inc
Andrey Pavlenko [Fri, 5 Jul 2013 09:02:09 +0000 (13:02 +0400)]
Merge pull request #1092 from asmorkalov:manager_version_inc

11 years agoMerge pull request #1087 from znah:2.4
Roman Donchenko [Fri, 5 Jul 2013 08:07:44 +0000 (12:07 +0400)]
Merge pull request #1087 from znah:2.4

11 years agoOpenCV Manager version++.
Alexander Smorkalov [Fri, 5 Jul 2013 08:07:04 +0000 (12:07 +0400)]
OpenCV Manager version++.

11 years agoMerge pull request #1091 from SpecLad:xls-updates
Roman Donchenko [Fri, 5 Jul 2013 08:00:52 +0000 (12:00 +0400)]
Merge pull request #1091 from SpecLad:xls-updates

11 years agofix the function name
yao [Fri, 5 Jul 2013 00:59:21 +0000 (08:59 +0800)]
fix the function name

11 years agoxls-report.py: make behaviour more intelligent in case of repeated results
Roman Donchenko [Thu, 4 Jul 2013 15:59:26 +0000 (19:59 +0400)]
xls-report.py: make behaviour more intelligent in case of repeated results

11 years agoxls-report.py: write tests in sorted order
Roman Donchenko [Thu, 4 Jul 2013 14:52:10 +0000 (18:52 +0400)]
xls-report.py: write tests in sorted order