platform/upstream/opencv.git
12 years agoMerge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial...
Andrey Kamaev [Tue, 13 Nov 2012 15:45:14 +0000 (19:45 +0400)]
Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix

12 years agoLogcat message for disabled test cases added.
Alexander Smorkalov [Tue, 13 Nov 2012 07:41:08 +0000 (11:41 +0400)]
Logcat message for disabled test cases added.

12 years agoMore common way of test case disabling implemented.
Alexander Smorkalov [Tue, 13 Nov 2012 06:29:49 +0000 (10:29 +0400)]
More common way of test case disabling implemented.

12 years agoCode review comments applied.
Alexander Smorkalov [Mon, 12 Nov 2012 14:01:56 +0000 (18:01 +0400)]
Code review comments applied.

12 years agoCode review comments applied.
Alexander Smorkalov [Mon, 12 Nov 2012 13:47:20 +0000 (17:47 +0400)]
Code review comments applied.

12 years agoLibinfo build fix;
Alexander Smorkalov [Fri, 9 Nov 2012 08:16:48 +0000 (12:16 +0400)]
Libinfo build fix;
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.

12 years agoJava test fix. Eclipse test execution fix.
Alexander Smorkalov [Fri, 9 Nov 2012 07:46:14 +0000 (11:46 +0400)]
Java test fix. Eclipse test execution fix.

12 years agoAndroid tutorial updated. HelloWorld sample ported on new framework.
mikle [Fri, 2 Nov 2012 12:27:26 +0000 (18:27 +0600)]
Android tutorial updated. HelloWorld sample ported on new framework.

12 years agoFace Detection sample namespace replaced on org.opencv.facedetect for consistency...
Alexander Smorkalov [Wed, 7 Nov 2012 09:27:33 +0000 (13:27 +0400)]
Face Detection sample namespace replaced on org.opencv.facedetect for consistency with Google Play.

12 years agofix the compilation bug of main.cpp in perf test and accuracy test on ocl module...
NikoKJ [Wed, 7 Nov 2012 05:49:09 +0000 (13:49 +0800)]
fix the compilation bug of main.cpp in perf test and accuracy test on ocl module. It caused by the incompatibility of command line parser class in core.hpp between master branch and 2.4 branch.

12 years agoMerge release 2.4.3
Andrey Kamaev [Fri, 2 Nov 2012 13:45:58 +0000 (17:45 +0400)]
Merge release 2.4.3

12 years agoUpdated docs to 2.4.3
Evgeny Talanin [Fri, 2 Nov 2012 13:29:49 +0000 (17:29 +0400)]
Updated docs to 2.4.3

12 years agoMerge pull request #134 from apavlenko/android-tutorial
Andrey Kamaev [Fri, 2 Nov 2012 13:02:40 +0000 (17:02 +0400)]
Merge pull request #134 from apavlenko/android-tutorial

12 years agoMerge pull request #133 from vpisarev/ios_atomic_fix
Andrey Kamaev [Fri, 2 Nov 2012 13:01:51 +0000 (17:01 +0400)]
Merge pull request #133 from vpisarev/ios_atomic_fix

12 years agoAndroid Tutorial update (TADP link, Android SDK platforms, CDT)
Andrey Pavlenko [Fri, 2 Nov 2012 12:11:08 +0000 (16:11 +0400)]
Android Tutorial update (TADP link, Android SDK platforms, CDT)

12 years agofixed compile problem with the old Xcode (<4.5)
Vadim Pisarevsky [Fri, 2 Nov 2012 11:29:16 +0000 (15:29 +0400)]
fixed compile problem with the old Xcode (<4.5)

12 years agoMerge pull request #132 from taka-no-me/version-2.4.3
Andrey Kamaev [Fri, 2 Nov 2012 10:31:30 +0000 (14:31 +0400)]
Merge pull request #132 from taka-no-me/version-2.4.3

12 years agoMerge pull request #131 from taka-no-me/tegra-fast
Andrey Kamaev [Fri, 2 Nov 2012 10:31:02 +0000 (14:31 +0400)]
Merge pull request #131 from taka-no-me/tegra-fast

12 years agoMerge pull request #129 from cuda-geek/CCL-test-fix
Andrey Kamaev [Fri, 2 Nov 2012 10:30:20 +0000 (14:30 +0400)]
Merge pull request #129 from cuda-geek/CCL-test-fix

12 years agoMerge pull request #127 from cuda-geek/apple2clang
Andrey Kamaev [Fri, 2 Nov 2012 10:29:39 +0000 (14:29 +0400)]
Merge pull request #127 from cuda-geek/apple2clang

12 years agoRemove "-rc" suffix from version
Andrey Kamaev [Fri, 2 Nov 2012 10:27:34 +0000 (14:27 +0400)]
Remove "-rc" suffix from version

12 years agoUse Tegra version of cv::FAST
Andrey Kamaev [Fri, 2 Nov 2012 09:16:16 +0000 (13:16 +0400)]
Use Tegra version of cv::FAST

12 years agopossibly fixed compile errors in GPU module on Windows
Vadim Pisarevsky [Fri, 2 Nov 2012 08:03:25 +0000 (12:03 +0400)]
possibly fixed compile errors in GPU module on Windows

12 years agofix Connected Components Labeling test crash
marina.kolpakova [Thu, 1 Nov 2012 19:59:01 +0000 (23:59 +0400)]
fix Connected Components Labeling test crash

12 years agoMerge pull request #122 from kirill-kornyakov:2.4-android-documentation-fixes
marina.kolpakova [Thu, 1 Nov 2012 18:29:28 +0000 (22:29 +0400)]
Merge pull request #122 from kirill-kornyakov:2.4-android-documentation-fixes

12 years agoUpdated OpenCV4Android SDK tutorial
Kirill Kornyakov [Wed, 31 Oct 2012 15:04:39 +0000 (19:04 +0400)]
Updated OpenCV4Android SDK tutorial

12 years agoUpdated Introduction into Android Development tutorial
Kirill Kornyakov [Wed, 31 Oct 2012 14:42:52 +0000 (18:42 +0400)]
Updated Introduction into Android Development tutorial

12 years agoRewrote abs documentation without funcx, so now :ocv:funcx: is used only for operator()
Kirill Kornyakov [Wed, 31 Oct 2012 12:32:04 +0000 (16:32 +0400)]
Rewrote abs documentation without funcx, so now :ocv:funcx: is used only for operator()

12 years agoFixed a couple of minor issues in Javadocs
Kirill Kornyakov [Wed, 31 Oct 2012 11:42:36 +0000 (15:42 +0400)]
Fixed a couple of minor issues in Javadocs

12 years agoUpdated link to OpenCV for Android page in README.android
Kirill Kornyakov [Wed, 31 Oct 2012 11:11:10 +0000 (15:11 +0400)]
Updated link to OpenCV for Android page in README.android

12 years agoreplase __APPLE__ marco with __clang__
marina.kolpakova [Thu, 1 Nov 2012 14:59:07 +0000 (18:59 +0400)]
replase __APPLE__ marco with __clang__

12 years agoMerge pull request #125 from taka-no-me:perf_tests
marina.kolpakova [Thu, 1 Nov 2012 15:31:05 +0000 (19:31 +0400)]
Merge pull request #125 from taka-no-me:perf_tests

12 years agoMerge pull request #115 from asmorkalov:java_test_data_update
marina.kolpakova [Thu, 1 Nov 2012 15:28:37 +0000 (19:28 +0400)]
Merge pull request #115 from asmorkalov:java_test_data_update

12 years agoMerge pull request #124 from branch taka-no-me:vs8-vs9-tbb
marina.kolpakova [Thu, 1 Nov 2012 15:26:11 +0000 (19:26 +0400)]
Merge pull request #124 from branch taka-no-me:vs8-vs9-tbb

12 years agoMerge pull request #120 from NikoKJ:ocl2.4.3
marina.kolpakova [Thu, 1 Nov 2012 15:15:47 +0000 (19:15 +0400)]
Merge pull request #120 from NikoKJ:ocl2.4.3

12 years agoMerge pull request #121 from branch asmorkalov:android_samples_fix
marina.kolpakova [Thu, 1 Nov 2012 15:08:32 +0000 (19:08 +0400)]
Merge pull request #121 from branch asmorkalov:android_samples_fix

12 years agoMerge pull request #126 from vpisarev:bug_fixes3
marina.kolpakova [Thu, 1 Nov 2012 14:31:23 +0000 (18:31 +0400)]
Merge pull request #126 from vpisarev:bug_fixes3

12 years agoanother fix to make OpenCV more friendly for iOS developers. We now use libc++ instea...
Vadim Pisarevsky [Thu, 1 Nov 2012 14:15:48 +0000 (18:15 +0400)]
another fix to make OpenCV more friendly for iOS developers. We now use libc++ instead of libstdc++ and clang instead of gcc to build opencv2.framework.

12 years agoMerge pull request #123 from asmorkalov/manager_static_lib_info
Andrey Kamaev [Thu, 1 Nov 2012 13:08:45 +0000 (17:08 +0400)]
Merge pull request #123 from asmorkalov/manager_static_lib_info

12 years agofixed bugs #2300 (Vector::dot) and #2467 (build with Xcode 4.5 with --stdlib=libc++)
Vadim Pisarevsky [Thu, 1 Nov 2012 12:37:39 +0000 (16:37 +0400)]
fixed bugs #2300 (Vector::dot) and #2467 (build with Xcode 4.5 with --stdlib=libc++)

12 years agoFixed sanity checks in several performance tests
Andrey Kamaev [Thu, 1 Nov 2012 12:29:30 +0000 (16:29 +0400)]
Fixed sanity checks in several performance tests

12 years agoReview comments applied.
Alexander Smorkalov [Thu, 1 Nov 2012 12:18:49 +0000 (16:18 +0400)]
Review comments applied.

12 years agoRemove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB...
Andrey Kamaev [Thu, 1 Nov 2012 08:44:10 +0000 (12:44 +0400)]
Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.

12 years agoFix build in Visual Studio 2005
Andrey Kamaev [Wed, 31 Oct 2012 20:48:00 +0000 (00:48 +0400)]
Fix build in Visual Studio 2005

12 years agoinfo library for OpenCV added.
Alexander Smorkalov [Wed, 31 Oct 2012 16:35:37 +0000 (20:35 +0400)]
info library for OpenCV added.

12 years agoOpenCV Samples testing problems fixed:
Alexander Smorkalov [Wed, 31 Oct 2012 11:20:49 +0000 (15:20 +0400)]
OpenCV Samples testing problems fixed:
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;

12 years agoMerge pull request #81 from stephenfox/master
Andrey Kamaev [Wed, 31 Oct 2012 12:59:45 +0000 (16:59 +0400)]
Merge pull request #81 from stephenfox/master

12 years agoMerge pull request #111 from taka-no-me/algorithm/addParam-short
Andrey Kamaev [Wed, 31 Oct 2012 12:57:06 +0000 (16:57 +0400)]
Merge pull request #111 from taka-no-me/algorithm/addParam-short

12 years agoMerge pull request #117 from vpisarev/doc_updates
Andrey Kamaev [Wed, 31 Oct 2012 12:56:04 +0000 (16:56 +0400)]
Merge pull request #117 from vpisarev/doc_updates

12 years agoMerge pull request #118 from asmorkalov/opencv_manager_cmake
Andrey Kamaev [Wed, 31 Oct 2012 12:54:07 +0000 (16:54 +0400)]
Merge pull request #118 from asmorkalov/opencv_manager_cmake

12 years agoMerge pull request #110 from vpisarev/test_fixes2
Andrey Kamaev [Wed, 31 Oct 2012 12:52:50 +0000 (16:52 +0400)]
Merge pull request #110 from vpisarev/test_fixes2

12 years agoMerge pull request #112 from taka-no-me/warnings
Andrey Kamaev [Wed, 31 Oct 2012 12:51:35 +0000 (16:51 +0400)]
Merge pull request #112 from taka-no-me/warnings

12 years agofixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
Vadim Pisarevsky [Tue, 30 Oct 2012 13:58:44 +0000 (17:58 +0400)]
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)

12 years agoa minor bug fix for brute force
NikoKJ [Wed, 31 Oct 2012 08:01:56 +0000 (16:01 +0800)]
a minor bug fix for brute force

12 years agoCMake for OpenCV Manager updated;
Alexander Smorkalov [Tue, 30 Oct 2012 15:01:06 +0000 (19:01 +0400)]
CMake for OpenCV Manager updated;
Some repo normalization problems fixed;
Deprecated cmake keys removed;
Warning fixed.

12 years agoupdated patch for tests; reenabled SURF & Denoising; removed fixes in ocl tests,...
Vadim Pisarevsky [Tue, 30 Oct 2012 11:25:46 +0000 (15:25 +0400)]
updated patch for tests; reenabled SURF & Denoising; removed fixes in ocl tests, since this is already fixed in another pull request

12 years agoMerge branch '2.4'
Andrey Kamaev [Tue, 30 Oct 2012 11:10:17 +0000 (15:10 +0400)]
Merge branch '2.4'

12 years agoMerge rebased pull request #106 from albenoit/retina_devel
Andrey Kamaev [Tue, 30 Oct 2012 11:07:35 +0000 (15:07 +0400)]
Merge rebased pull request #106 from albenoit/retina_devel

12 years agominor updates for doc redirections and tutorial images size
alexandre benoit [Sun, 28 Oct 2012 17:52:04 +0000 (18:52 +0100)]
minor updates for doc redirections and tutorial images size

12 years agominor update
alexandre benoit [Sun, 28 Oct 2012 17:34:48 +0000 (18:34 +0100)]
minor update

12 years agoupdated first image sample
alexandre benoit [Sun, 28 Oct 2012 09:57:03 +0000 (10:57 +0100)]
updated first image sample

12 years agoadded retina code tutorial
alexandre benoit [Wed, 24 Oct 2012 10:20:59 +0000 (12:20 +0200)]
added retina code tutorial

12 years agoupdated tutorial, rapid spell check, retina parameters discussion added
alexandre benoit [Wed, 24 Oct 2012 10:04:32 +0000 (12:04 +0200)]
updated tutorial, rapid spell check, retina parameters discussion added

12 years agoupdated tutorial, need spell check, validation, nicer images and a discussion on...
alexandre benoit [Tue, 23 Oct 2012 16:57:39 +0000 (18:57 +0200)]
updated tutorial, need spell check, validation, nicer images and a discussion on parameters

12 years agoadding retina tutorial
alexandre benoit [Mon, 22 Oct 2012 11:51:55 +0000 (13:51 +0200)]
adding retina tutorial

12 years agointroducing a tutorial for the retina model
alexandre benoit [Mon, 22 Oct 2012 11:36:30 +0000 (13:36 +0200)]
introducing a tutorial for the retina model

12 years agoTest data form features2d updated.
Alexander [Mon, 29 Oct 2012 16:34:36 +0000 (20:34 +0400)]
Test data form features2d updated.

12 years agoMerge pull request #109 from asmorkalov/2.4
Andrey Kamaev [Tue, 30 Oct 2012 09:02:29 +0000 (13:02 +0400)]
Merge pull request #109 from asmorkalov/2.4

12 years agoMerge pull request #102 from NikoKJ/ocl4_2.43
Andrey Kamaev [Tue, 30 Oct 2012 08:57:26 +0000 (12:57 +0400)]
Merge pull request #102 from NikoKJ/ocl4_2.43

12 years agoeliminate all the warnings on win32 and win64
NikoKJ [Fri, 26 Oct 2012 09:43:59 +0000 (17:43 +0800)]
eliminate all the warnings on win32 and win64
add a new function abssum
fix the bug of test and perf because someone remove non-free module from cmakelist.txt

12 years agofixed compile errors in ocl tests; disabled a few problematic tests
Vadim Pisarevsky [Mon, 29 Oct 2012 19:37:18 +0000 (23:37 +0400)]
fixed compile errors in ocl tests; disabled a few problematic tests

12 years agoMemory leak of native OpenCV mats fixed.
Alexander [Mon, 29 Oct 2012 12:56:21 +0000 (16:56 +0400)]
Memory leak of native OpenCV mats fixed.

12 years agoMerge pull request #104 from AoD314:master
marina.kolpakova [Mon, 29 Oct 2012 11:12:28 +0000 (15:12 +0400)]
Merge pull request #104 from AoD314:master

12 years agoMerge pull request #99 from jet47:tvl1-opt-flow
marina.kolpakova [Mon, 29 Oct 2012 11:00:15 +0000 (15:00 +0400)]
Merge pull request #99 from jet47:tvl1-opt-flow

12 years agofixed bug with incorrect syntax in CommandLineParser
morozov.andrey [Fri, 26 Oct 2012 15:46:17 +0000 (19:46 +0400)]
fixed bug with incorrect syntax in CommandLineParser

12 years agoTurn off video IO perf tests on Android
Andrey Kamaev [Fri, 26 Oct 2012 10:55:16 +0000 (14:55 +0400)]
Turn off video IO perf tests on Android

12 years agoSpecify sanity threshold for WarpPerspective perf test
Andrey Kamaev [Fri, 26 Oct 2012 10:53:32 +0000 (14:53 +0400)]
Specify sanity threshold for WarpPerspective perf test

12 years agoFix SHORT data type support in Algorithm
Andrey Kamaev [Thu, 25 Oct 2012 14:59:10 +0000 (18:59 +0400)]
Fix SHORT data type support in Algorithm

* typo in Algorithm::addParam for 'short' data type which results in segmentation fault on ARM
  on attempt to set type property for FAST using setter inherited from Algorithm
* added short type support to read/write methods
* improved some error messages

12 years agoMerge pull request #103 from asmorkalov/2.4
Andrey Kamaev [Fri, 26 Oct 2012 10:40:18 +0000 (14:40 +0400)]
Merge pull request #103 from asmorkalov/2.4

12 years agoTutorial 1 updated. Execution time camera switching implemented.
Alexander Smorkalov [Fri, 26 Oct 2012 09:27:42 +0000 (13:27 +0400)]
Tutorial 1 updated. Execution time camera switching implemented.
Some unification done to simplify camera switching.

12 years agoIssue 2473 Service connection leak in OpenCV Manager installation waiting fixed.
Alexander Smorkalov [Thu, 25 Oct 2012 13:09:54 +0000 (17:09 +0400)]
Issue 2473 Service connection leak in OpenCV Manager installation waiting fixed.
Some code refactoring done.

12 years agoIssue 2472 Android samples crash on Camera.StartPreview on Android 4.1 fixed.
Alexander Smorkalov [Thu, 25 Oct 2012 11:45:18 +0000 (15:45 +0400)]
Issue 2472 Android samples crash on Camera.StartPreview on Android 4.1 fixed.

12 years agoMerge branch '2.4'
Andrey Kamaev [Thu, 25 Oct 2012 11:32:48 +0000 (15:32 +0400)]
Merge branch '2.4'

12 years agoMerge pull request #74 from taka-no-me/cl2cpp
Andrey Kamaev [Thu, 25 Oct 2012 10:56:53 +0000 (14:56 +0400)]
Merge pull request #74 from taka-no-me/cl2cpp

12 years agoCleanup CMakeLists.txt of ocl module
Andrey Kamaev [Sat, 20 Oct 2012 12:37:46 +0000 (16:37 +0400)]
Cleanup CMakeLists.txt of ocl module

12 years agoMerge pull request #92 from LeonidBeynenson/cv_algorithm_changes_2.4
Andrey Kamaev [Thu, 25 Oct 2012 10:52:50 +0000 (14:52 +0400)]
Merge pull request #92 from LeonidBeynenson/cv_algorithm_changes_2.4

12 years agofixed warnings under Windows
Vladislav Vinogradov [Thu, 25 Oct 2012 09:28:30 +0000 (13:28 +0400)]
fixed warnings under Windows

12 years agoDual TV-L1 optical flow implementation
Vladislav Vinogradov [Fri, 19 Oct 2012 08:54:06 +0000 (12:54 +0400)]
Dual TV-L1 optical flow implementation

12 years agoMerge pull request #87 from jet47:cmd-parser-fix
marina.kolpakova [Wed, 24 Oct 2012 20:40:31 +0000 (00:40 +0400)]
Merge pull request #87 from jet47:cmd-parser-fix

12 years agoSuppress more warnings in gtest on OS X
Andrey Kamaev [Wed, 24 Oct 2012 16:36:30 +0000 (20:36 +0400)]
Suppress more warnings in gtest on OS X

12 years agoFix remaining windows build warnings
Andrey Kamaev [Wed, 24 Oct 2012 16:27:20 +0000 (20:27 +0400)]
Fix remaining windows build warnings

12 years agoMerge 2.4.3-rc
Andrey Kamaev [Wed, 24 Oct 2012 15:56:27 +0000 (19:56 +0400)]
Merge 2.4.3-rc

12 years agoUpdated docs to 2.4.3 rc
Evgeny Talanin [Wed, 24 Oct 2012 13:28:17 +0000 (17:28 +0400)]
Updated docs to 2.4.3 rc

12 years agoMerge pull request #95 from apavlenko/perf-test/warp
Andrey Kamaev [Wed, 24 Oct 2012 11:39:53 +0000 (15:39 +0400)]
Merge pull request #95 from apavlenko/perf-test/warp

12 years agoMerge pull request #97 from asmorkalov/2.4
Andrey Kamaev [Wed, 24 Oct 2012 11:02:05 +0000 (15:02 +0400)]
Merge pull request #97 from asmorkalov/2.4

12 years agoMerge pull request #94 from vpisarev/test_fixes
Andrey Kamaev [Wed, 24 Oct 2012 10:42:20 +0000 (14:42 +0400)]
Merge pull request #94 from vpisarev/test_fixes

12 years agofixed 2 test failures (test_DrawChessboardCorners & Core_Array.expressions)
Vadim Pisarevsky [Tue, 23 Oct 2012 21:58:17 +0000 (01:58 +0400)]
fixed 2 test failures (test_DrawChessboardCorners & Core_Array.expressions)

12 years agoOpenCV Manager version ++.
Alexander Smorkalov [Wed, 24 Oct 2012 09:25:07 +0000 (13:25 +0400)]
OpenCV Manager version ++.

12 years agoCode normalization problems fixed.
Alexander Smorkalov [Wed, 24 Oct 2012 08:47:43 +0000 (12:47 +0400)]
Code normalization problems fixed.
Rair hangs on library installation fixed.

12 years agoRepo normalization problems fixed.
Alexander Smorkalov [Wed, 24 Oct 2012 08:46:36 +0000 (12:46 +0400)]
Repo normalization problems fixed.