platform/upstream/opencv.git
11 years agoMerge cuda-geek/soft-cascade-gpu into cuda-dev
marina.kolpakova [Mon, 26 Nov 2012 14:57:47 +0000 (18:57 +0400)]
Merge cuda-geek/soft-cascade-gpu into cuda-dev

11 years agoMerge origin/master into cuda-dev
marina.kolpakova [Mon, 26 Nov 2012 14:54:29 +0000 (18:54 +0400)]
Merge origin/master into cuda-dev

11 years agoclean code; fix problems in documentation
marina.kolpakova [Mon, 26 Nov 2012 14:50:08 +0000 (18:50 +0400)]
clean code; fix problems in documentation

11 years agofix CUDA support for streams for NMS; refactor tests
marina.kolpakova [Mon, 26 Nov 2012 13:53:25 +0000 (17:53 +0400)]
fix CUDA support for streams for NMS; refactor tests

11 years agointegrate NMS (Dollar's criteria)
marina.kolpakova [Mon, 26 Nov 2012 13:22:47 +0000 (17:22 +0400)]
integrate NMS (Dollar's criteria)

11 years agonms: part 1
marina.kolpakova [Mon, 26 Nov 2012 11:26:11 +0000 (15:26 +0400)]
nms: part 1

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.

11 years agofixed compile without cuda
marina.kolpakova [Wed, 14 Nov 2012 16:34:17 +0000 (20:34 +0400)]
fixed compile without cuda

11 years agocheck if scaling values changed
marina.kolpakova [Wed, 14 Nov 2012 16:28:08 +0000 (20:28 +0400)]
check if scaling values changed

11 years agosoft cascade sample
marina.kolpakova [Wed, 14 Nov 2012 16:11:18 +0000 (20:11 +0400)]
soft cascade sample

11 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

11 years agofixed typo
marina.kolpakova [Wed, 14 Nov 2012 10:49:38 +0000 (14:49 +0400)]
fixed typo

11 years agorefactor: PrefixSum
marina.kolpakova [Wed, 14 Nov 2012 10:47:00 +0000 (14:47 +0400)]
refactor: PrefixSum

11 years agoremove hardcoded values
marina.kolpakova [Wed, 14 Nov 2012 10:36:59 +0000 (14:36 +0400)]
remove hardcoded values

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

11 years agoremove debug detect at scale method
marina.kolpakova [Wed, 14 Nov 2012 10:21:22 +0000 (14:21 +0400)]
remove debug detect at scale method

11 years agoremove size constraints of input frame
marina.kolpakova [Wed, 14 Nov 2012 10:00:02 +0000 (14:00 +0400)]
remove size constraints of input frame

11 years agointegrate pre-Kepler architectures
marina.kolpakova [Wed, 14 Nov 2012 08:40:44 +0000 (12:40 +0400)]
integrate pre-Kepler architectures

11 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.

11 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'

11 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

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

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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

11 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

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

11 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

11 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.

11 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.

11 years agoexport to python/java
marina.kolpakova [Mon, 12 Nov 2012 22:49:35 +0000 (02:49 +0400)]
export to python/java

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

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

11 years agoGK107 Policy
marina.kolpakova [Mon, 12 Nov 2012 12:37:18 +0000 (16:37 +0400)]
GK107 Policy

11 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.

11 years agorefactor computing of scaling factor
marina.kolpakova [Mon, 12 Nov 2012 07:54:40 +0000 (11:54 +0400)]
refactor computing of scaling factor

11 years agoOptimized buffers reuse in gpu module:
Vladislav Vinogradov [Fri, 26 Oct 2012 11:49:39 +0000 (15:49 +0400)]
Optimized buffers reuse in gpu module:

ensureSizeIsEnough now doesn't reallocate memory, if buffer is small submat of big matrix
fixed createContinous according new changes

11 years agospeedup compilation of row_filter.cu and column_filter.cu
Vladislav Vinogradov [Fri, 9 Nov 2012 09:14:59 +0000 (13:14 +0400)]
speedup compilation of row_filter.cu and column_filter.cu

split them into several small files

11 years agomoved block.hpp to include folder
Vladislav Vinogradov [Tue, 30 Oct 2012 08:14:07 +0000 (12:14 +0400)]
moved block.hpp to include folder

11 years agoGPU soft cascade documentation
marina.kolpakova [Sat, 10 Nov 2012 01:48:06 +0000 (05:48 +0400)]
GPU soft cascade documentation

11 years agoadd comments to class declaration
marina.kolpakova [Sat, 10 Nov 2012 00:26:38 +0000 (04:26 +0400)]
add comments to class declaration

11 years agoadd support for CUDA streams
marina.kolpakova [Fri, 9 Nov 2012 23:59:09 +0000 (03:59 +0400)]
add support for CUDA streams

11 years agoGPU version becomes algorithm
marina.kolpakova [Fri, 9 Nov 2012 20:49:51 +0000 (00:49 +0400)]
GPU version becomes algorithm

11 years agofix negative confidence bug
marina.kolpakova [Fri, 9 Nov 2012 20:48:37 +0000 (00:48 +0400)]
fix negative confidence bug

11 years agoenable fast integral for Kepler
marina.kolpakova [Mon, 5 Nov 2012 14:52:35 +0000 (18:52 +0400)]
enable fast  integral for Kepler

11 years agoremove Sobel normalization
marina.kolpakova [Mon, 5 Nov 2012 10:21:46 +0000 (14:21 +0400)]
remove Sobel normalization

11 years agouse fast integral for soft cascade
marina.kolpakova [Mon, 5 Nov 2012 09:52:24 +0000 (13:52 +0400)]
use fast integral for soft cascade

11 years agoadd DeviceInfo parameter to the soft cascade tests
marina.kolpakova [Sat, 3 Nov 2012 23:29:20 +0000 (03:29 +0400)]
add DeviceInfo parameter to the soft cascade tests

11 years agofix compilation problem after rebase
marina.kolpakova [Sat, 3 Nov 2012 14:03:31 +0000 (18:03 +0400)]
fix compilation problem after rebase

11 years agoadd support for precomputed integrals
marina.kolpakova [Mon, 15 Oct 2012 17:55:57 +0000 (21:55 +0400)]
add support for precomputed integrals

11 years agoadd sanity check to performance tests for soft cascade
marina.kolpakova [Mon, 15 Oct 2012 14:13:58 +0000 (18:13 +0400)]
add sanity check to performance tests for soft cascade

11 years agofix retrieval of detections count
marina.kolpakova [Mon, 15 Oct 2012 13:38:21 +0000 (17:38 +0400)]
fix retrieval of detections count

11 years agofix rounding bug in Level creation
marina.kolpakova [Mon, 15 Oct 2012 11:27:33 +0000 (15:27 +0400)]
fix rounding bug in Level creation

11 years agorefactor performance tests
marina.kolpakova [Thu, 11 Oct 2012 17:56:36 +0000 (21:56 +0400)]
refactor performance tests

11 years agoadd factory method for Fields structure
marina.kolpakova [Thu, 11 Oct 2012 15:11:39 +0000 (19:11 +0400)]
add factory method for Fields structure

11 years agokernel policy
marina.kolpakova [Thu, 11 Oct 2012 14:24:48 +0000 (18:24 +0400)]
kernel policy

11 years agorefactor preprocessing
marina.kolpakova [Thu, 11 Oct 2012 13:05:23 +0000 (17:05 +0400)]
refactor preprocessing

11 years agomove preprocessing into separate function
marina.kolpakova [Thu, 11 Oct 2012 12:47:49 +0000 (16:47 +0400)]
move preprocessing into separate function

11 years agofix performance test
marina.kolpakova [Thu, 11 Oct 2012 12:27:23 +0000 (16:27 +0400)]
fix performance test

11 years agofix buggy threshold zeroing if feature has zero area
marina.kolpakova [Thu, 11 Oct 2012 12:26:32 +0000 (16:26 +0400)]
fix buggy threshold zeroing if feature has zero area

11 years agoremove debug code
marina.kolpakova [Thu, 11 Oct 2012 10:19:24 +0000 (14:19 +0400)]
remove debug code

11 years agomove Level into shared memory
marina.kolpakova [Mon, 8 Oct 2012 16:20:57 +0000 (20:20 +0400)]
move Level into shared memory

11 years agooptimize roi loads
marina.kolpakova [Mon, 8 Oct 2012 11:37:28 +0000 (15:37 +0400)]
optimize roi loads

only one thread load roi for all block

11 years agoCorrects objects matrix in case of the absence of objects
marina.kolpakova [Wed, 3 Oct 2012 12:39:37 +0000 (16:39 +0400)]
Corrects objects matrix in case of the absence of objects

11 years agoAdd performance detection test in ROI; refactored soft cascade performance tests
marina.kolpakova [Wed, 3 Oct 2012 12:36:00 +0000 (16:36 +0400)]
Add performance detection test in ROI; refactored soft cascade performance tests

11 years agoAdd performance test for detection in ROI; refactor soft cascade performance tests
marina.kolpakova [Wed, 3 Oct 2012 10:26:26 +0000 (14:26 +0400)]
Add performance test for  detection in ROI; refactor soft cascade performance tests

11 years agoadd roi support
marina.kolpakova [Tue, 2 Oct 2012 13:25:26 +0000 (17:25 +0400)]
add roi support

11 years agoadd getROISize
marina.kolpakova [Tue, 2 Oct 2012 12:45:40 +0000 (16:45 +0400)]
add getROISize

11 years agoimplement different behaviour for up- and down-scaling
marina.kolpakova [Mon, 1 Oct 2012 10:50:28 +0000 (14:50 +0400)]
implement different behaviour for up- and down-scaling

11 years agointegrate Kepler version
marina.kolpakova [Mon, 1 Oct 2012 10:08:48 +0000 (14:08 +0400)]
integrate Kepler version

11 years agoadd test that stores detections on the specific scale
marina.kolpakova [Mon, 1 Oct 2012 09:49:21 +0000 (13:49 +0400)]
add test that stores detections on the specific scale

11 years agoupdate soft cascade interface: - add class Detection in interface, - split sync...
marina.kolpakova [Mon, 1 Oct 2012 09:48:16 +0000 (13:48 +0400)]
update soft cascade interface:  - add class Detection in interface,  - split sync- and async- versions,  - add support for detecting at the specific scale.