platform/upstream/opencv.git
11 years agoMerge branch '2.4'
Andrey Kamaev [Tue, 12 Feb 2013 12:30:18 +0000 (16:30 +0400)]
Merge branch '2.4'

11 years agoMerge pull request #476 from apavlenko:eclipse_import_fix
Andrey Kamaev [Mon, 11 Feb 2013 17:38:07 +0000 (21:38 +0400)]
Merge pull request #476 from apavlenko:eclipse_import_fix

11 years agoMerge pull request #470 from kirill-kornyakov:bug_2788_testing_add_method_for_column
Andrey Kamaev [Mon, 11 Feb 2013 17:16:39 +0000 (21:16 +0400)]
Merge pull request #470 from kirill-kornyakov:bug_2788_testing_add_method_for_column

11 years agoMerge pull request #473 from prclibo:2.4
Andrey Kamaev [Mon, 11 Feb 2013 16:48:03 +0000 (20:48 +0400)]
Merge pull request #473 from prclibo:2.4

11 years agoMerge pull request #471 from apavlenko:jar_install
Andrey Kamaev [Mon, 11 Feb 2013 16:46:48 +0000 (20:46 +0400)]
Merge pull request #471 from apavlenko:jar_install

11 years agofixing eclipse import errors that can also be fixed via 'Fix Project Properties'...
Andrey Pavlenko [Mon, 11 Feb 2013 15:49:18 +0000 (19:49 +0400)]
fixing eclipse import errors that can also be fixed via 'Fix Project Properties' menu

11 years agoMerge pull request #467 from asmorkalov:manager_jni_overflow
Andrey Kamaev [Mon, 11 Feb 2013 15:17:41 +0000 (19:17 +0400)]
Merge pull request #467 from asmorkalov:manager_jni_overflow

11 years agoMerge pull request #416 from asmaloney:mat-docs-cleanup
Andrey Kamaev [Mon, 11 Feb 2013 14:51:03 +0000 (18:51 +0400)]
Merge pull request #416 from asmaloney:mat-docs-cleanup

11 years agofix issue 2788
Bo Li [Mon, 11 Feb 2013 14:09:42 +0000 (15:09 +0100)]
fix issue 2788

11 years agoReenabled second test
Kirill Kornyakov [Mon, 11 Feb 2013 12:53:41 +0000 (16:53 +0400)]
Reenabled second test

11 years agoTemporary disabled parallel_writers_and_readers test
Andrey Kamaev [Mon, 11 Feb 2013 12:52:20 +0000 (16:52 +0400)]
Temporary disabled parallel_writers_and_readers test

11 years agoconfigure desktop Java install, making JNI library name correct, and making it fat...
Andrey Pavlenko [Mon, 11 Feb 2013 12:28:19 +0000 (16:28 +0400)]
configure desktop Java install, making JNI library name correct, and making it fat when possible

11 years agoBug #2759 android.os.DeadObjectException on OpenCV Manager connection fixed.
Alexander Smorkalov [Mon, 11 Feb 2013 10:12:51 +0000 (14:12 +0400)]
Bug #2759 android.os.DeadObjectException on OpenCV Manager connection fixed.
DeleteLocalRef calls for jclass objects added.

11 years agoAdded two tests to highlight bug #2788
Kirill Kornyakov [Mon, 11 Feb 2013 11:25:15 +0000 (15:25 +0400)]
Added two tests to highlight bug #2788

11 years agoMerge pull request #457 from taka-no-me:fix_vars_expansion
Andrey Kamaev [Mon, 11 Feb 2013 10:37:14 +0000 (14:37 +0400)]
Merge pull request #457 from taka-no-me:fix_vars_expansion

11 years agoAdjust OpenCV version to 2.4.4
Andrey Kamaev [Mon, 11 Feb 2013 10:17:29 +0000 (14:17 +0400)]
Adjust OpenCV version to 2.4.4

11 years agoRevert ffmpeg related changes from "thread-safe VideoWriter and VideoCapture"
Andrey Kamaev [Mon, 11 Feb 2013 10:15:29 +0000 (14:15 +0400)]
Revert ffmpeg related changes from "thread-safe VideoWriter and VideoCapture"

This reverts commit 4abf0b31936c96887c028d799c6e89edfc4e197b.

Changes are reverted because they break build of proxy dlls on Windows

11 years agoMerge pull request #465 from asmorkalov:android_camera_connect
Andrey Kamaev [Mon, 11 Feb 2013 10:05:37 +0000 (14:05 +0400)]
Merge pull request #465 from asmorkalov:android_camera_connect

11 years agoMerge pull request #466 from taka-no-me:fix_android_package
Andrey Kamaev [Mon, 11 Feb 2013 10:04:07 +0000 (14:04 +0400)]
Merge pull request #466 from taka-no-me:fix_android_package

11 years agoMerge pull request #464 from asmaloney:missing_fclose
Andrey Kamaev [Mon, 11 Feb 2013 10:03:51 +0000 (14:03 +0400)]
Merge pull request #464 from asmaloney:missing_fclose

11 years agoMerge pull request #458 from taka-no-me:tbb_4.1u2
Andrey Kamaev [Mon, 11 Feb 2013 10:03:10 +0000 (14:03 +0400)]
Merge pull request #458 from taka-no-me:tbb_4.1u2

11 years agoMerge pull request #454 from asmorkalov:android_samples_reorganize
Andrey Kamaev [Mon, 11 Feb 2013 10:02:54 +0000 (14:02 +0400)]
Merge pull request #454 from asmorkalov:android_samples_reorganize

11 years agoMerge pull request #446 from AnnaKogan8:updated-perf-timing-script
Andrey Kamaev [Mon, 11 Feb 2013 10:02:39 +0000 (14:02 +0400)]
Merge pull request #446 from AnnaKogan8:updated-perf-timing-script

11 years agoFix build of package for Google Play
Andrey Kamaev [Mon, 11 Feb 2013 08:59:37 +0000 (12:59 +0400)]
Fix build of package for Google Play

11 years agoCode review notes fixed.
Alexander Smorkalov [Mon, 11 Feb 2013 07:36:12 +0000 (11:36 +0400)]
Code review notes fixed.

11 years agoIssue in NativeCameraView and JavaCameraView fixed.
Alexander Smorkalov [Mon, 11 Feb 2013 05:43:44 +0000 (09:43 +0400)]
Issue in NativeCameraView and JavaCameraView fixed.
In previous version getWidth() and getHeight() values were used instead method parameters.

11 years agoIf generating a bin file (second half of conditional), make sure the file is closed
Andy Maloney [Mon, 11 Feb 2013 02:55:20 +0000 (21:55 -0500)]
If generating a bin file (second half of conditional), make sure the file is closed
(Also fix spelling in comment)

11 years agoMerge pull request #456 from vpisarev:python_ptseq_fix
Andrey Kamaev [Fri, 8 Feb 2013 14:52:03 +0000 (18:52 +0400)]
Merge pull request #456 from vpisarev:python_ptseq_fix

11 years agoMerge pull request #428 from bitwangyaoyao:2.4_erode_dilate
Andrey Kamaev [Fri, 8 Feb 2013 14:48:36 +0000 (18:48 +0400)]
Merge pull request #428 from bitwangyaoyao:2.4_erode_dilate

11 years agoMerge pull request #402 from asmorkalov:samples_data_rase_fix
Andrey Kamaev [Fri, 8 Feb 2013 14:48:13 +0000 (18:48 +0400)]
Merge pull request #402 from asmorkalov:samples_data_rase_fix

11 years agoUpdate tbb to version 4.1 update 2
Andrey Kamaev [Fri, 8 Feb 2013 14:45:24 +0000 (18:45 +0400)]
Update tbb to version 4.1 update 2

11 years agoMerge pull request #455 from AlexeySpizhevoy:2.4
Andrey Kamaev [Fri, 8 Feb 2013 14:45:24 +0000 (18:45 +0400)]
Merge pull request #455 from AlexeySpizhevoy:2.4

11 years agoMerge pull request #452 from asmorkalov:android_tutorial_update
Andrey Kamaev [Fri, 8 Feb 2013 14:43:57 +0000 (18:43 +0400)]
Merge pull request #452 from asmorkalov:android_tutorial_update

11 years agoMerge pull request #450 from bitwangyaoyao:2.4_dft
Andrey Kamaev [Fri, 8 Feb 2013 14:43:34 +0000 (18:43 +0400)]
Merge pull request #450 from bitwangyaoyao:2.4_dft

11 years agoFix CMake variables substitution in Android project files
Andrey Kamaev [Fri, 8 Feb 2013 14:21:49 +0000 (18:21 +0400)]
Fix CMake variables substitution in Android project files

11 years agofixed problem with Nx2 numpy arrays in geometrical functions (#2783)
Vadim Pisarevsky [Fri, 8 Feb 2013 14:11:56 +0000 (18:11 +0400)]
fixed problem with Nx2 numpy arrays in geometrical functions (#2783)

11 years agofixed assertion failure (vector out of range) for the 'vc10,debug' build (#2775)
Alexey Spizhevoy [Fri, 8 Feb 2013 13:44:57 +0000 (17:44 +0400)]
fixed assertion failure (vector out of range) for the 'vc10,debug' build (#2775)

11 years agoTutorial for Android synchronized with actual application framework.
Alexander Smorkalov [Fri, 8 Feb 2013 08:03:13 +0000 (12:03 +0400)]
Tutorial for Android synchronized with actual application framework.

11 years agoMerge pull request #442 from asmorkalov:linux_cross_compile
Andrey Kamaev [Fri, 8 Feb 2013 10:37:09 +0000 (14:37 +0400)]
Merge pull request #442 from asmorkalov:linux_cross_compile

11 years agoMerge pull request #448 from Nerei:bp_doc_change_24
Andrey Kamaev [Fri, 8 Feb 2013 10:29:56 +0000 (14:29 +0400)]
Merge pull request #448 from Nerei:bp_doc_change_24

11 years agoTutorial-1-Java -> Tutorial-1-CameraPreview
Alexander Smorkalov [Tue, 5 Feb 2013 11:46:47 +0000 (15:46 +0400)]
Tutorial-1-Java -> Tutorial-1-CameraPreview
Issues fix.

11 years agoProject files for Eclipse updated.
Alexander Smorkalov [Tue, 5 Feb 2013 11:27:23 +0000 (15:27 +0400)]
Project files for Eclipse updated.

11 years agoTutorial-5 -> Tutorial-3
Alexander Smorkalov [Tue, 5 Feb 2013 11:10:34 +0000 (15:10 +0400)]
Tutorial-5 -> Tutorial-3

11 years agoTutorial4 sample renamed to Tutorial-2-MixedProcessing
Alexander Smorkalov [Tue, 5 Feb 2013 09:12:00 +0000 (13:12 +0400)]
Tutorial4 sample renamed to Tutorial-2-MixedProcessing

11 years agoTutorial-3 removed as dublicate part of tutorial-4.
Alexander Smorkalov [Tue, 5 Feb 2013 08:19:11 +0000 (12:19 +0400)]
Tutorial-3 removed as dublicate part of tutorial-4.

11 years agoTutorial-2 removed as dublicate of tutorial-1 and image manipulations sample.
Alexander Smorkalov [Mon, 4 Feb 2013 13:28:55 +0000 (17:28 +0400)]
Tutorial-2 removed as dublicate of tutorial-1 and image manipulations sample.

11 years agoTutorial 1 renamed
Alexander Smorkalov [Mon, 4 Feb 2013 13:26:43 +0000 (17:26 +0400)]
Tutorial 1 renamed

11 years agoCode review notes fixed;
Alexander Smorkalov [Wed, 6 Feb 2013 15:18:36 +0000 (19:18 +0400)]
Code review notes fixed;
HardFP and SoftFP toolchains joined to one;
RPATH skiping added.

11 years ago15-puzzle app reverted to usage of old CvCameraViewListener implementation;
Alexander Smorkalov [Fri, 8 Feb 2013 05:43:21 +0000 (09:43 +0400)]
15-puzzle app reverted to usage of old CvCameraViewListener implementation;
super.onPause() call moved to begining of onPause method according Google recomandations.

11 years agosome bugs fix in using AmdFft library
yao [Fri, 8 Feb 2013 02:46:43 +0000 (10:46 +0800)]
some bugs fix in using AmdFft library

11 years agoBP doc change according to Adrian's request (OpenCV book co-author)
Anatoly Baksheev [Thu, 7 Feb 2013 18:25:15 +0000 (22:25 +0400)]
BP doc change according to Adrian's request (OpenCV book co-author)

11 years agoAdded --failed-only option and multiple input files support
Anna Kogan [Thu, 7 Feb 2013 12:29:28 +0000 (16:29 +0400)]
Added --failed-only option and multiple input files support

11 years agoCode review issues fixed. Compatibility issues fixed.
Alexander Smorkalov [Thu, 7 Feb 2013 09:01:26 +0000 (13:01 +0400)]
Code review issues fixed. Compatibility issues fixed.

11 years agoMerge pull request #444 from taka-no-me:fix_o0_warnings
Andrey Kamaev [Wed, 6 Feb 2013 20:15:52 +0000 (00:15 +0400)]
Merge pull request #444 from taka-no-me:fix_o0_warnings

11 years agoFix some warnings from -O0 build
Andrey Kamaev [Wed, 6 Feb 2013 16:57:36 +0000 (20:57 +0400)]
Fix some warnings from -O0 build

11 years agoMerge pull request #443 from taka-no-me:fix_cascade_test
Andrey Kamaev [Wed, 6 Feb 2013 12:40:38 +0000 (16:40 +0400)]
Merge pull request #443 from taka-no-me:fix_cascade_test

11 years agoMerge pull request #441 from jet47:filter-speckles-8u
Andrey Kamaev [Wed, 6 Feb 2013 11:12:02 +0000 (15:12 +0400)]
Merge pull request #441 from jet47:filter-speckles-8u

11 years agoUse gtest assertions in cascade test
Andrey Kamaev [Wed, 6 Feb 2013 11:07:31 +0000 (15:07 +0400)]
Use gtest assertions in cascade test

This simplifies test debugging a lot

11 years agoCarma board support fixed.
Alexander Smorkalov [Wed, 6 Feb 2013 10:41:58 +0000 (14:41 +0400)]
Carma board support fixed.

11 years agoTBB build for arm linux fixed. Processors count detected correctly.
Alexander Smorkalov [Wed, 6 Feb 2013 08:55:37 +0000 (12:55 +0400)]
TBB build for arm linux fixed. Processors count detected correctly.

11 years agoCUDA toolkit support added to crosscompilation toolchain.
Alexander Smorkalov [Tue, 5 Feb 2013 12:04:53 +0000 (16:04 +0400)]
CUDA toolkit support added to crosscompilation toolchain.

11 years agoCompiler and linker flags for arm cross compilation fixed.
Alexander Smorkalov [Thu, 24 Jan 2013 09:29:55 +0000 (13:29 +0400)]
Compiler and linker flags for arm cross compilation fixed.

11 years agoCode review notes applied.
Alexander Smorkalov [Mon, 21 Jan 2013 12:45:35 +0000 (16:45 +0400)]
Code review notes applied.
Toolchain for arm hardfp added.

11 years agoTBB build defines for Linux added.
Alexander Smorkalov [Fri, 11 Jan 2013 07:23:48 +0000 (11:23 +0400)]
TBB build defines for Linux added.

11 years agoCross compilation toolchain for arm linux added.
Alexander Smorkalov [Fri, 11 Jan 2013 06:50:40 +0000 (10:50 +0400)]
Cross compilation toolchain for arm linux added.

11 years agoTBB download and build option enabled for non Android platfroms.
Alexander Smorkalov [Thu, 10 Jan 2013 13:18:01 +0000 (17:18 +0400)]
TBB download and build option enabled for non Android platfroms.

11 years agoVideo IO perf tests guarded.
Alexander Smorkalov [Mon, 28 Jan 2013 09:14:47 +0000 (13:14 +0400)]
Video IO perf tests guarded.

11 years agoadded 8u type support to filterSpeckles function
Vladislav Vinogradov [Wed, 6 Feb 2013 06:30:26 +0000 (10:30 +0400)]
added 8u type support to filterSpeckles function

11 years agoMerge pull request #434 from taka-no-me:fix_parallel_writer_test
Andrey Kamaev [Wed, 6 Feb 2013 10:04:59 +0000 (14:04 +0400)]
Merge pull request #434 from taka-no-me:fix_parallel_writer_test

11 years agoMerge pull request #438 from bitwangyaoyao:2.4_fixwarings
Andrey Kamaev [Wed, 6 Feb 2013 10:04:27 +0000 (14:04 +0400)]
Merge pull request #438 from bitwangyaoyao:2.4_fixwarings

11 years agoremove the warnings in accuracy test
yao [Wed, 6 Feb 2013 01:12:40 +0000 (09:12 +0800)]
remove the warnings in accuracy test

11 years agoMerge pull request #432 from bitwangyaoyao:2.4_blend
Andrey Kamaev [Tue, 5 Feb 2013 10:53:49 +0000 (14:53 +0400)]
Merge pull request #432 from bitwangyaoyao:2.4_blend

11 years agoMerge pull request #431 from snosov1:matchTemplate-tegra
Andrey Kamaev [Tue, 5 Feb 2013 10:50:15 +0000 (14:50 +0400)]
Merge pull request #431 from snosov1:matchTemplate-tegra

11 years agoremove a warning on Linux
yao [Tue, 5 Feb 2013 09:16:40 +0000 (17:16 +0800)]
remove a warning on Linux
fix a error in doc

11 years agoAndroid samples updated according onCameraFrame callback signature change.
Alexander Smorkalov [Fri, 1 Feb 2013 08:42:21 +0000 (12:42 +0400)]
Android samples updated according onCameraFrame callback signature change.
FpsMeter class removed from Image Manipulations and Face Detection examples as unused code.

11 years agoonCameraFrame callback signature changed. CvCameraFame interface added.
Alexander Smorkalov [Thu, 31 Jan 2013 12:13:12 +0000 (16:13 +0400)]
onCameraFrame callback signature changed. CvCameraFame interface added.

New interface allows to get one RGBA or Gray frame from camera or both in the same time;
New interface fixes data rase in samples also.

11 years agoMerge branch 2.4
Andrey Kamaev [Mon, 4 Feb 2013 13:15:55 +0000 (17:15 +0400)]
Merge branch 2.4

11 years agoMerge pull request #427 from vrabaud:brisk_fixes_2.4
Andrey Kamaev [Mon, 4 Feb 2013 13:10:02 +0000 (17:10 +0400)]
Merge pull request #427 from vrabaud:brisk_fixes_2.4

11 years agostricter eps for normed methods
Sergei Nosov [Mon, 4 Feb 2013 09:29:52 +0000 (13:29 +0400)]
stricter eps for normed methods

11 years agoMerge pull request #404 from asmorkalov:android_opencvmk_fix
Andrey Kamaev [Mon, 4 Feb 2013 11:49:48 +0000 (15:49 +0400)]
Merge pull request #404 from asmorkalov:android_opencvmk_fix

11 years agoMerge pull request #409 from asmorkalov:giganetix_cams_patch_master
Andrey Kamaev [Mon, 4 Feb 2013 10:57:13 +0000 (14:57 +0400)]
Merge pull request #409 from asmorkalov:giganetix_cams_patch_master

11 years agoMerge pull request #408 from asmorkalov:giganetix_cams_patch
Andrey Kamaev [Mon, 4 Feb 2013 10:56:54 +0000 (14:56 +0400)]
Merge pull request #408 from asmorkalov:giganetix_cams_patch

11 years agoMake parallel video writer test pass if compiled without threading support
Andrey Kamaev [Mon, 4 Feb 2013 10:34:44 +0000 (14:34 +0400)]
Make parallel video writer test pass if compiled without threading support

11 years agodefine the default remapping in the right scope
Vincent Rabaud [Sun, 3 Feb 2013 13:31:59 +0000 (14:31 +0100)]
define the default remapping in the right scope

11 years agowrite documentation for BRISK
Vincent Rabaud [Sun, 3 Feb 2013 13:31:15 +0000 (14:31 +0100)]
write documentation for  BRISK

11 years agoblend use vector to optimize
yao [Mon, 4 Feb 2013 09:29:20 +0000 (17:29 +0800)]
blend use vector to optimize

11 years agomatchTemplate perf tests added
Sergei Nosov [Mon, 4 Feb 2013 08:57:22 +0000 (12:57 +0400)]
matchTemplate perf tests added

11 years agoenable Tegra optimizations
Sergei Nosov [Mon, 4 Feb 2013 08:57:03 +0000 (12:57 +0400)]
enable Tegra optimizations

11 years agoMerge pull request #420 from asmaloney:check-mem-alloc
Andrey Kamaev [Mon, 4 Feb 2013 08:56:35 +0000 (12:56 +0400)]
Merge pull request #420 from asmaloney:check-mem-alloc

11 years agoMerge pull request #413 from berak:master
Andrey Kamaev [Mon, 4 Feb 2013 08:56:12 +0000 (12:56 +0400)]
Merge pull request #413 from berak:master

11 years agoModules redifinition in case of multiple includes of OpenCV.mk in single Android...
Alexander Smorkalov [Fri, 1 Feb 2013 09:15:39 +0000 (13:15 +0400)]
Modules redifinition in case of multiple includes of OpenCV.mk in single Android.mk fixed.

11 years agoMerge pull request #429 from bitwangyaoyao:2.4_setdevEx
Andrey Kamaev [Mon, 4 Feb 2013 08:03:24 +0000 (12:03 +0400)]
Merge pull request #429 from bitwangyaoyao:2.4_setdevEx

11 years agoMerge pull request #425 from asmaloney:vector_empty
Andrey Kamaev [Mon, 4 Feb 2013 08:03:03 +0000 (12:03 +0400)]
Merge pull request #425 from asmaloney:vector_empty

11 years agoMerge pull request #424 from asmaloney:additional-checks
Andrey Kamaev [Mon, 4 Feb 2013 08:02:43 +0000 (12:02 +0400)]
Merge pull request #424 from asmaloney:additional-checks

11 years agoMerge pull request #421 from asmaloney:check-mem-alloc2
Andrey Kamaev [Mon, 4 Feb 2013 08:02:27 +0000 (12:02 +0400)]
Merge pull request #421 from asmaloney:check-mem-alloc2

11 years agoMerge pull request #410 from taka-no-me:fix_cap_dshow_setfps
Andrey Kamaev [Mon, 4 Feb 2013 07:57:32 +0000 (11:57 +0400)]
Merge pull request #410 from taka-no-me:fix_cap_dshow_setfps

11 years agoMerge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4
Andrey Kamaev [Mon, 4 Feb 2013 07:54:43 +0000 (11:54 +0400)]
Merge pull request #395 from LeonidBeynenson:fix_ml_large_data_bug__2.4

11 years agoadd setDeviceEx interface
yao [Mon, 4 Feb 2013 07:06:36 +0000 (15:06 +0800)]
add setDeviceEx interface
simplify the logic of save binary

11 years agosimplify the kernel logic when using rect kernel or without ROI
yao [Mon, 4 Feb 2013 05:33:27 +0000 (13:33 +0800)]
simplify the kernel logic when using rect kernel or without ROI

11 years agoadd compute capability check
marina.kolpakova [Sun, 3 Feb 2013 18:44:13 +0000 (22:44 +0400)]
add compute capability check