platform/upstream/opencv.git
11 years agoMerge pull request #166 from askforeric:pvapi_updates
Andrey Kamaev [Wed, 28 Nov 2012 07:31:01 +0000 (11:31 +0400)]
Merge pull request #166 from  askforeric:pvapi_updates

11 years agoRefactored the PvAPI capture class to better facilitate dynamic property changes
askforeric [Tue, 13 Nov 2012 21:10:22 +0000 (16:10 -0500)]
Refactored the PvAPI capture class to better facilitate dynamic property changes

- Added Gain control
- Changed default acquisition mode to grayscale
- Fixed a signed/unsigned compare issue
- Implemented frame resizing
- Implemented automatic buffer resizing on frame resize
- Corrected camera initialization so that it attempts to put the camera in Mono8
  but does not fail if this doesn't succeed.

11 years agoMerge pull request #186 from vpisarev:doc_fixes_master
Andrey Kamaev [Mon, 26 Nov 2012 18:34:42 +0000 (22:34 +0400)]
Merge pull request #186 from vpisarev:doc_fixes_master

11 years agofixed building PDFs in master
Vadim Pisarevsky [Mon, 26 Nov 2012 16:40:45 +0000 (20:40 +0400)]
fixed building PDFs in master

11 years agoMerge pull #173 request from cuda-geek/fix-sc-arm
marina.kolpakova [Fri, 23 Nov 2012 10:21:51 +0000 (14:21 +0400)]
Merge pull #173 request from cuda-geek/fix-sc-arm

11 years agofix tests for arm
marina.kolpakova [Thu, 22 Nov 2012 09:25:46 +0000 (13:25 +0400)]
fix tests for arm

11 years agoMerge branch 2.4
Andrey Kamaev [Tue, 20 Nov 2012 15:12:00 +0000 (19:12 +0400)]
Merge branch 2.4

Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4

11 years agoMerge pull request #161 from apavlenko:fix/sdk_r21
Andrey Kamaev [Tue, 20 Nov 2012 15:07:08 +0000 (19:07 +0400)]
Merge pull request #161 from apavlenko:fix/sdk_r21

11 years agoImproving compatibility with the latest Android SDK (r21) and NDK (r8c).
Andrey Pavlenko [Tue, 20 Nov 2012 14:27:03 +0000 (18:27 +0400)]
Improving compatibility with the latest Android SDK (r21) and NDK (r8c).

- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects

11 years agoMerge pull request #170 from asmorkalov:engine_build_fix
Andrey Kamaev [Tue, 20 Nov 2012 14:27:43 +0000 (18:27 +0400)]
Merge pull request #170 from asmorkalov:engine_build_fix

11 years agoMerging pull request #169 from taka-no-me:android-ndk-r8c
Andrey Kamaev [Tue, 20 Nov 2012 13:56:11 +0000 (17:56 +0400)]
Merging pull request #169 from taka-no-me:android-ndk-r8c

11 years agoMerging pull request #167 from asmorkalov:java_api_manager_test
Andrey Kamaev [Tue, 20 Nov 2012 13:53:06 +0000 (17:53 +0400)]
Merging pull request #167 from asmorkalov:java_api_manager_test

11 years agoLibinfo build fix;
Alexander Smorkalov [Tue, 20 Nov 2012 13:17:22 +0000 (17:17 +0400)]
Libinfo build fix;
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.

11 years agoMerging pull request #162 from taka-no-me/opencv
Andrey Kamaev [Tue, 20 Nov 2012 13:33:33 +0000 (17:33 +0400)]
Merging pull request #162 from taka-no-me/opencv

11 years ago'Merging pull request 163 from asmorkalov/opencv'
Andrey Kamaev [Tue, 20 Nov 2012 13:23:02 +0000 (17:23 +0400)]
'Merging pull request 163 from asmorkalov/opencv'

11 years agoFix Android build with clang compiler
Andrey Kamaev [Mon, 19 Nov 2012 11:16:13 +0000 (15:16 +0400)]
Fix Android build with clang compiler

11 years agoUpdate Android CMake toolchain for NDK r8c
Andrey Kamaev [Thu, 15 Nov 2012 08:44:57 +0000 (12:44 +0400)]
Update Android CMake toolchain for NDK r8c

11 years agoTest execution inside Eclipse fixed;
Alexander Smorkalov [Tue, 20 Nov 2012 06:45:46 +0000 (10:45 +0400)]
Test execution inside Eclipse fixed;
OpenCV testing via OpenCV Manager implemented.

11 years agoIssue #2548 Missing static library libtbb.a for armeabi and mips build fixed.
Alexander Smorkalov [Mon, 19 Nov 2012 08:58:17 +0000 (12:58 +0400)]
Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.

11 years agoUpdate URL for TBB download. Update to TBB 4.1 update 1
Andrey Kamaev [Mon, 19 Nov 2012 07:43:28 +0000 (11:43 +0400)]
Update URL for TBB download. Update to TBB 4.1 update 1

11 years agoMerge pull request #160 from asmorkalov/android_4_2_manager_fix
Andrey Kamaev [Fri, 16 Nov 2012 13:44:34 +0000 (17:44 +0400)]
Merge pull request #160 from asmorkalov/android_4_2_manager_fix

11 years agoMerge pull request #159 from asmorkalov/libinfo_install_fix
Andrey Kamaev [Fri, 16 Nov 2012 13:44:02 +0000 (17:44 +0400)]
Merge pull request #159 from asmorkalov/libinfo_install_fix

11 years agoMerge pull request #157 from vpisarev/bug_fixes5
Andrey Kamaev [Fri, 16 Nov 2012 13:43:21 +0000 (17:43 +0400)]
Merge pull request #157 from vpisarev/bug_fixes5

11 years agoIssue #2537 OpenCV Manager doesn't work on Android 4.2 fixed.
Alexander Smorkalov [Fri, 16 Nov 2012 13:01:25 +0000 (17:01 +0400)]
Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed.

11 years agoIssue #2541 make install does not work for Android build fixed.
Alexander Smorkalov [Thu, 15 Nov 2012 07:24:41 +0000 (11:24 +0400)]
Issue #2541 make install does not work for Android build fixed.

12 years agoMerge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF
Andrey Kamaev [Wed, 14 Nov 2012 13:30:06 +0000 (17:30 +0400)]
Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF

12 years agoModified documentation for calcOpticalFlowSF.
LeonidBeynenson [Wed, 14 Nov 2012 10:27:41 +0000 (14:27 +0400)]
Modified documentation for calcOpticalFlowSF.

12 years agoRevert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears...
marina.kolpakova [Tue, 13 Nov 2012 19:52:18 +0000 (23:52 +0400)]
Revert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears only in 2.4

This reverts commit 7e301c5c0e0591a751258d044f5f2f0889231591, reversing
changes made to b5e009eb87154b830759fe9276b6233f852a4e77.

12 years agoMerge remote-tracking branch 'cuda-geek/soft-cascade-cpu'
marina.kolpakova [Tue, 13 Nov 2012 19:37:44 +0000 (23:37 +0400)]
Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu'

12 years agoadded CV_OUT to StereoVar output paramiter
Alexander Mordvintsev [Mon, 12 Nov 2012 10:42:51 +0000 (14:42 +0400)]
added CV_OUT to StereoVar output paramiter

12 years agofix for negative confidence
marina.kolpakova [Tue, 13 Nov 2012 19:08:19 +0000 (23:08 +0400)]
fix for negative confidence

12 years agoMerge branch 2.4
Andrey Kamaev [Tue, 13 Nov 2012 15:54:48 +0000 (19:54 +0400)]
Merge branch 2.4

12 years agoMerge pull request #147 from taka-no-me/win_warnings
Andrey Kamaev [Tue, 13 Nov 2012 15:48:51 +0000 (19:48 +0400)]
Merge pull request #147 from taka-no-me/win_warnings

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 agoMerge pull request #156 from jet47/gpu-hough-lines-fix
Andrey Kamaev [Tue, 13 Nov 2012 14:24:36 +0000 (18:24 +0400)]
Merge pull request #156 from jet47/gpu-hough-lines-fix

12 years agoMerge pull request #155 from jet47/gpu-test-fix
Andrey Kamaev [Tue, 13 Nov 2012 14:23:52 +0000 (18:23 +0400)]
Merge pull request #155 from jet47/gpu-test-fix

12 years agoMerge pull request #149 from taka-no-me/osx_warnings
Andrey Kamaev [Tue, 13 Nov 2012 14:21:40 +0000 (18:21 +0400)]
Merge pull request #149 from taka-no-me/osx_warnings

12 years agoMerge pull request #148 from taka-no-me/tutorial_codes
Andrey Kamaev [Tue, 13 Nov 2012 14:20:49 +0000 (18:20 +0400)]
Merge pull request #148 from taka-no-me/tutorial_codes

12 years agoMerge pull request #146 from taka-no-me/win_opengl
Andrey Kamaev [Tue, 13 Nov 2012 14:19:42 +0000 (18:19 +0400)]
Merge pull request #146 from taka-no-me/win_opengl

12 years agoMerge pull request #145 from taka-no-me/vec_print
Andrey Kamaev [Tue, 13 Nov 2012 14:18:48 +0000 (18:18 +0400)]
Merge pull request #145 from taka-no-me/vec_print

12 years agoMerge pull request #143 from vpisarev/bug_fixes4
Andrey Kamaev [Tue, 13 Nov 2012 14:17:33 +0000 (18:17 +0400)]
Merge pull request #143 from vpisarev/bug_fixes4

12 years agoMerge pull request #141 from jet47/gpu-pyrlk-fix
Andrey Kamaev [Tue, 13 Nov 2012 14:16:19 +0000 (18:16 +0400)]
Merge pull request #141 from jet47/gpu-pyrlk-fix

12 years agoMerge pull request #144 from asmorkalov/fd_package_fix_2.4
Andrey Kamaev [Tue, 13 Nov 2012 14:13:33 +0000 (18:13 +0400)]
Merge pull request #144 from asmorkalov/fd_package_fix_2.4

12 years agofixed bug in gpu::HoughLines
Vladislav Vinogradov [Tue, 13 Nov 2012 13:54:17 +0000 (17:54 +0400)]
fixed bug in gpu::HoughLines

12 years agofixed gpu module tests
Vladislav Vinogradov [Tue, 13 Nov 2012 13:50:29 +0000 (17:50 +0400)]
fixed gpu module tests

uses old CommandLineParser class

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 agoexport to python/java
marina.kolpakova [Mon, 12 Nov 2012 22:49:35 +0000 (02:49 +0400)]
export to python/java

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 agoFix OS X build warnings
Andrey Kamaev [Fri, 9 Nov 2012 07:29:52 +0000 (11:29 +0400)]
Fix OS X build warnings

12 years agoRename sample & tutorial executables
Andrey Kamaev [Thu, 8 Nov 2012 07:41:27 +0000 (11:41 +0400)]
Rename sample & tutorial executables

12 years agoBuild tutorial codes together with other samples
Andrey Kamaev [Wed, 7 Nov 2012 14:21:20 +0000 (18:21 +0400)]
Build tutorial codes together with other samples

These codes should be included into regular builds.

12 years agoFix Windows build warnings
Andrey Kamaev [Wed, 7 Nov 2012 23:15:43 +0000 (03:15 +0400)]
Fix Windows build warnings

12 years agoFix build on Windows with OpenGl enabled
Andrey Kamaev [Wed, 7 Nov 2012 22:11:27 +0000 (02:11 +0400)]
Fix build on Windows with OpenGl enabled

There was missing windows.h include in OpenGL interop code.

12 years agoFix stream output operator for Vec<uchar,n>
Andrey Kamaev [Fri, 9 Nov 2012 03:53:31 +0000 (07:53 +0400)]
Fix stream output operator for Vec<uchar,n>

This fixes output for 8U and 8S vector depths.
They were mistakenly printed as characters instead of numbers.

12 years agoFace detection package name replaced on org.opencv.facedetect for consistency with...
Alexander Smorkalov [Fri, 9 Nov 2012 05:40:19 +0000 (09:40 +0400)]
Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package.

12 years agofix warnings under win
marina.kolpakova [Thu, 8 Nov 2012 20:07:32 +0000 (00:07 +0400)]
fix warnings under win

12 years agofixed problem with LBPHFaceRecognizer::update() without breaking binary compatibility.
Vadim Pisarevsky [Thu, 8 Nov 2012 12:15:04 +0000 (16:15 +0400)]
fixed problem with LBPHFaceRecognizer::update() without breaking binary compatibility.

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 agoimproved accuracy of 3x3 invert on poorly-conditioned matrices (bug #2525)
Vadim Pisarevsky [Thu, 8 Nov 2012 10:09:43 +0000 (14:09 +0400)]
improved accuracy of 3x3 invert on poorly-conditioned matrices (bug #2525)

12 years agomin and max params become double
marina.kolpakova [Wed, 7 Nov 2012 22:33:19 +0000 (02:33 +0400)]
min and max params become double

12 years agogit warning
marina.kolpakova [Wed, 7 Nov 2012 22:16:04 +0000 (02:16 +0400)]
git warning

12 years agofix compilation under win
marina.kolpakova [Wed, 7 Nov 2012 20:08:43 +0000 (00:08 +0400)]
fix compilation under win

12 years agofix levels computing
marina.kolpakova [Wed, 7 Nov 2012 00:20:35 +0000 (04:20 +0400)]
fix levels computing

12 years agoclean code
marina.kolpakova [Tue, 6 Nov 2012 23:14:15 +0000 (03:14 +0400)]
clean code

12 years agofixed typo
marina.kolpakova [Tue, 6 Nov 2012 22:27:07 +0000 (02:27 +0400)]
fixed typo

12 years agofix angle scaling
marina.kolpakova [Tue, 6 Nov 2012 22:21:48 +0000 (02:21 +0400)]
fix angle scaling

12 years agodocumentation
marina.kolpakova [Tue, 6 Nov 2012 21:50:33 +0000 (01:50 +0400)]
documentation

12 years agoadd object init
marina.kolpakova [Mon, 5 Nov 2012 22:41:26 +0000 (02:41 +0400)]
add object init

12 years agoadd ROI support
marina.kolpakova [Mon, 5 Nov 2012 21:30:20 +0000 (01:30 +0400)]
add ROI support

12 years agorefactor integral channels
marina.kolpakova [Mon, 5 Nov 2012 19:28:37 +0000 (23:28 +0400)]
refactor integral channels

12 years agoupdate test according to resize usage
marina.kolpakova [Mon, 5 Nov 2012 18:56:23 +0000 (22:56 +0400)]
update test according to resize usage

12 years agosoft cascade become Algorithm
marina.kolpakova [Mon, 5 Nov 2012 18:42:08 +0000 (22:42 +0400)]
soft cascade become Algorithm

12 years agofixed bug in gpu::PyrLKOpticalFlow::dense
Vladislav Vinogradov [Wed, 7 Nov 2012 13:13:19 +0000 (17:13 +0400)]
fixed bug in gpu::PyrLKOpticalFlow::dense

vector index out of range

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 agoremove input frame size constraints
marina.kolpakova [Thu, 1 Nov 2012 11:43:50 +0000 (15:43 +0400)]
remove input frame size constraints

12 years agotest update because changed Sobel Normalization
marina.kolpakova [Thu, 1 Nov 2012 10:26:28 +0000 (14:26 +0400)]
test update because changed Sobel Normalization

12 years agobrief soft cascade interface description
marina.kolpakova [Thu, 1 Nov 2012 02:11:09 +0000 (06:11 +0400)]
brief soft cascade interface description

12 years agoget rid of hard-coded values
marina.kolpakova [Thu, 25 Oct 2012 10:50:48 +0000 (14:50 +0400)]
get rid of hard-coded values

12 years agomove scale related parameters to SoftCascade constructor
marina.kolpakova [Thu, 25 Oct 2012 08:22:54 +0000 (12:22 +0400)]
move scale related parameters to SoftCascade constructor

12 years agoload SoftCascade from FileStorage
marina.kolpakova [Thu, 25 Oct 2012 05:40:16 +0000 (09:40 +0400)]
load SoftCascade from FileStorage

12 years agorename markDetection to addDetection
marina.kolpakova [Thu, 25 Oct 2012 05:10:11 +0000 (09:10 +0400)]
rename markDetection to addDetection

12 years agoremove unused struct
marina.kolpakova [Wed, 24 Oct 2012 22:10:20 +0000 (02:10 +0400)]
remove unused struct

12 years agorename Stage to Weak because there is no such term for Soft Cascades
marina.kolpakova [Wed, 24 Oct 2012 22:03:46 +0000 (02:03 +0400)]
rename Stage to Weak because there is no such term for Soft Cascades

12 years agouse IntegralChannels class
marina.kolpakova [Wed, 24 Oct 2012 21:56:22 +0000 (01:56 +0400)]
use IntegralChannels class

12 years agomove frame processing into separate class
marina.kolpakova [Wed, 24 Oct 2012 19:10:15 +0000 (23:10 +0400)]
move frame processing into separate class

12 years agoremove debug imshow from code
marina.kolpakova [Sat, 6 Oct 2012 18:22:53 +0000 (22:22 +0400)]
remove debug imshow from code

12 years agoadd Detection struct to interface
marina.kolpakova [Sat, 6 Oct 2012 17:43:25 +0000 (21:43 +0400)]
add Detection struct to interface

12 years agoimprove pointer usage
marina.kolpakova [Sat, 6 Oct 2012 16:18:36 +0000 (20:18 +0400)]
improve pointer usage

12 years agoimprove cpu version of SoftCascade:
marina.kolpakova [Sat, 6 Oct 2012 12:58:48 +0000 (16:58 +0400)]
improve cpu version of SoftCascade:
 - remove division
 - remove cvRound
 - cache feature area

12 years agoadd const qualifier to detectMultiScale method
marina.kolpakova [Sat, 6 Oct 2012 11:15:59 +0000 (15:15 +0400)]
add const qualifier to detectMultiScale method

12 years agoremove Mat copying
marina.kolpakova [Fri, 5 Oct 2012 11:59:51 +0000 (15:59 +0400)]
remove Mat copying

12 years agoremove pow calculations
marina.kolpakova [Fri, 28 Sep 2012 12:32:33 +0000 (16:32 +0400)]
remove pow calculations

12 years agoadd perfomance test for CPU soft cascade
marina.kolpakova [Fri, 28 Sep 2012 06:21:22 +0000 (10:21 +0400)]
add perfomance test for CPU soft cascade

12 years agorefactor logs
marina.kolpakova [Tue, 25 Sep 2012 18:09:45 +0000 (22:09 +0400)]
refactor logs

12 years agoclean code
marina.kolpakova [Wed, 19 Sep 2012 14:57:59 +0000 (18:57 +0400)]
clean code