Commit Graph

6568 Commits

Author SHA1 Message Date
Vladislav Vinogradov
0b2c1dc871 fixed build without CUDA 2012-11-27 18:43:17 +04:00
Vladislav Vinogradov
d2591704e8 Merge branch 'kepler-optimization' into cuda-dev 2012-11-27 16:34:45 +04:00
Vladislav Vinogradov
2eca75ccdd added common TransformFunctorTraits for element operations 2012-11-27 11:08:53 +04:00
marina.kolpakova
22b0ea1cf0 sort for Hough sanity checks 2012-11-26 23:54:10 +04:00
marina.kolpakova
554a7cb33a add epsilon in sanity checks 2012-11-26 23:52:56 +04:00
marina.kolpakova
209f16455d Merge cuda-geek/soft-cascade-gpu into cuda-dev 2012-11-26 19:15:02 +04:00
marina.kolpakova
1712d0930c Merge origin/master into cuda-dev 2012-11-26 18:56:33 +04:00
marina.kolpakova
05cd88ae42 clean code; fix problems in documentation 2012-11-26 18:50:08 +04:00
marina.kolpakova
bd3179bda8 fix CUDA support for streams for NMS; refactor tests 2012-11-26 17:53:25 +04:00
marina.kolpakova
60c0e41ba5 integrate NMS (Dollar's criteria) 2012-11-26 17:22:47 +04:00
Vladislav Vinogradov
f022b12c57 saturate_cast via asm cvt command 2012-11-26 15:36:15 +04:00
marina.kolpakova
d2e88e1d4d nms: part 1 2012-11-26 15:26:11 +04:00
Vladislav Vinogradov
63a022dcd7 added explicit unroll to reduce implementation 2012-11-26 13:12:50 +04:00
Vladislav Vinogradov
11c6eb6305 element operations 2012-11-26 11:45:25 +04:00
Vladislav Vinogradov
f00efcfc59 added optimized deviceSupports function 2012-11-26 11:41:52 +04:00
Vladislav Vinogradov
a71ef7d67b convertTo 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
572d2d6a84 warpScanInclusive 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
76e8794e81 fixed warnings on old compute capabilities 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
e6b1ccdcdf removed old reduce implementation 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
e8f9762ef3 matrix reduction 2012-11-26 11:37:50 +04:00
Vladislav Vinogradov
fbf3de43a2 SURF 2012-11-26 11:37:38 +04:00
Vladislav Vinogradov
19c87d1c9d ORB 2012-11-26 11:37:38 +04:00
Vladislav Vinogradov
7f97fb481c FastNonLocalMeans 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
1f1e24be3c PyrLKOpticalFlow 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
1b571bde10 StereoConstantSpaceBP 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
0e339dd137 hog 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
0ddd16cf78 calcHist & equalizeHist 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
7e57648ea2 FGDStatModel 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
28716d7f30 Canny 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
e299595667 computeHypothesisScoresKernel 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
05db02fbc8 BruteForceMatcher 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
7a1874b2cc new reduce and reduceKeyVal implementation 2012-11-26 11:37:36 +04:00
Vladislav Vinogradov
d47c112434 fix abs_func and minimum/maximum functors 2012-11-26 11:37:36 +04:00
marina.kolpakova
5c2d59066f Merge pull #173 request from cuda-geek/fix-sc-arm 2012-11-23 14:22:04 +04:00
marina.kolpakova
6ccd7aca4c fix tests for arm 2012-11-22 13:26:13 +04:00
Andrey Kamaev
7f542e391a 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
2012-11-20 19:12:00 +04:00
Andrey Kamaev
d559c18ee5 Merge pull request #161 from apavlenko:fix/sdk_r21 2012-11-20 19:07:08 +04:00
Andrey Pavlenko
cfd634ca3e 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
2012-11-20 18:40:22 +04:00
Andrey Kamaev
4fce5a5e83 Merge pull request #170 from asmorkalov:engine_build_fix 2012-11-20 18:27:43 +04:00
Andrey Kamaev
934b623fa9 Merging pull request #169 from taka-no-me:android-ndk-r8c 2012-11-20 17:56:12 +04:00
Andrey Kamaev
d3397a1d6d Merging pull request #167 from asmorkalov:java_api_manager_test 2012-11-20 17:53:06 +04:00
Alexander Smorkalov
5b148083fe Libinfo build fix;
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
2012-11-20 17:39:45 +04:00
Andrey Kamaev
f172947ed5 Merging pull request #162 from taka-no-me/opencv 2012-11-20 17:33:34 +04:00
Andrey Kamaev
5527fc62f4 'Merging pull request 163 from asmorkalov/opencv' 2012-11-20 17:23:02 +04:00
Andrey Kamaev
04481d9ef4 Fix Android build with clang compiler 2012-11-20 15:20:04 +04:00
Andrey Kamaev
ab9311947a Update Android CMake toolchain for NDK r8c 2012-11-20 15:20:04 +04:00
Alexander Smorkalov
66a1ea7604 Test execution inside Eclipse fixed;
OpenCV testing via OpenCV Manager implemented.
2012-11-20 10:45:46 +04:00
Alexander Smorkalov
1f1d43fc88 Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed. 2012-11-19 12:58:17 +04:00
Andrey Kamaev
9ca1162be8 Update URL for TBB download. Update to TBB 4.1 update 1 2012-11-19 11:43:28 +04:00
Andrey Kamaev
6cd70c83fb Merge pull request #160 from asmorkalov/android_4_2_manager_fix 2012-11-16 17:44:34 +04:00