Roman Donchenko
d534d04f25
Merge pull request #2297 from asmorkalov:ocv_testdata_install_perms_fix
2014-02-07 15:33:59 +04:00
Vladislav Vinogradov
bfc27271e2
Revert "disable gpu Canny and HoughCircles perf tests:"
...
This reverts commit dbce90692a
2014-02-07 14:55:06 +04:00
Alexander Smorkalov
b86088b89c
Implicit testdata directory permissions setup added.
2014-02-07 14:42:35 +04:00
Roman Donchenko
c1b6bf21d5
Merge pull request #2300 from asmorkalov:android_no_cuda_not_armeabiv7a
2014-02-07 14:39:09 +04:00
Vladislav Vinogradov
3e1f74f2ca
fix nonfree module compilation without CUDA
2014-02-07 13:40:37 +04:00
Alexander Smorkalov
b10d4b05ed
dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.
2014-02-07 12:46:24 +04:00
Vladislav Vinogradov
5d099df578
Revert "disable CUDA generalized Hough Transform"
...
This reverts commit 33d42b740c
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
3e4bb371c8
fix epsilons for several gpu tests
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
b6ba1f226c
Revert "disable gpu CvtColor.*2HSV tests:"
...
This reverts commit 952027a853
2014-02-06 18:02:14 +04:00
Vladislav Vinogradov
da44a2fac1
Revert "disable gpu Subtract_Array test:"
...
This reverts commit e91bf95d58
2014-02-06 18:02:14 +04:00
Alexander Smorkalov
bc653add74
Absolute path to tests in opencv_run_app_tests.sh fixed.
...
(cherry picked from commit 530702c5f2
2014-02-06 17:16:21 +04:00
Roman Donchenko
34b02f6437
Merge pull request #2276 from asmorkalov:android_install_cuda
2014-02-06 16:45:49 +04:00
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
2014-02-06 15:32:57 +04:00
Roman Donchenko
e91b818e3e
Merge pull request #2292 from asmorkalov:ocv_deb_tests_script_path_fix
2014-02-06 14:59:31 +04:00
Andrey Pavlenko
a078653ab4
Merge pull request #2285 from KonstantinMatskevich:ocl_test_cascade2.4
2014-02-06 12:52:28 +04:00
Alexander Smorkalov
530702c5f2
Absolute path to tests in opencv_run_app_tests.sh fixed.
2014-02-06 12:35:14 +04:00
Roman Donchenko
feed2c074d
Merge pull request #2288 from asmorkalov:android_project_properties_generation_fix
2014-02-06 12:20:08 +04:00
Alexander Smorkalov
65b4d77959
project.properties file generation fixed for per-component installation.
2014-02-05 17:34:19 +04:00
Roman Donchenko
4ab891e9e5
Merge pull request #2277 from asmorkalov:android_test_path_fix
2014-02-05 12:36:37 +04:00
Konstantin Matskevich
435615ba2e
update test CascadeClassifier
2014-02-05 12:23:36 +04:00
Roman Donchenko
ccda4bf008
Merge pull request #2274 from jet47:android-mk-fix
2014-02-04 18:59:14 +04:00
Alexander Smorkalov
0cd0e4749b
Tests install path fix for Android SDK.
2014-02-04 16:23:01 +04:00
Vladislav Vinogradov
286fe261d0
save previous values of LOCAL_* variables and restore them at the end
2014-02-04 10:29:43 +04:00
Vladislav Vinogradov
a098fb1803
fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)
2014-02-04 10:29:15 +04:00
Vadim Pisarevsky
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +04:00
Roman Donchenko
cd1ffd169c
Merge pull request #2261 from jet47:stitching-cuda-android
2014-02-03 15:35:55 +04:00
Andrey Pavlenko
a1ad1f0800
Merge pull request #2259 from ilya-lavrenov:ocl_surf
2014-02-03 14:24:36 +04:00
Vladislav Vinogradov
214cbabc40
update stitching sample
2014-02-03 12:55:03 +04:00
Vladislav Vinogradov
a138e5a6a5
turn on CUDA part of stitching module on Android for non-dynamic build
2014-02-03 12:35:24 +04:00
Vladislav Vinogradov
d8f7377122
turn on CUDA part of nonfree module on Android for non-dynamic build
2014-02-03 11:52:43 +04:00
Ilya Lavrenov
ede5b23753
rewrote perf tests for SURF
2014-02-03 02:00:29 +04:00
Alexander Smorkalov
215f78eee2
Merge branch 'android_manager_version_inc4' into 2.4.8.1-prep
2014-01-31 22:25:36 +04:00
Vladislav Vinogradov
4425dac7f4
disable gpu CvtColor.*2HSV tests:
...
possible bug in CPU version(cherry picked from commit 3cb8b352e52f85847d98d2b0ece32ba5bdb5c31b)
2014-01-31 22:24:20 +04:00
Vladislav Vinogradov
4f79b9de48
disable gpu Subtract_Array test:
...
possible bug in CPU version(cherry picked from commit 59155c1eefb6f22e362e34a8d73b31841eb3413a)
2014-01-31 22:23:55 +04:00
Vladislav Vinogradov
397ac5e68f
disable gpu Canny and HoughCircles perf tests:
...
it fails because driver terminates CUDA kernels after time out
(cherry picked from commit fa5bbb5f8dc1a86cfe004fb258d66e56c90560d6)
2014-01-31 22:23:39 +04:00
Vladislav Vinogradov
43c75c64b5
disable NPP for GpuMat methods and for copyMakeBorder(cherry picked from commit 316d49fc0fb7a609ebb0a65efc207faea6b978a4)
2014-01-31 22:23:22 +04:00
Vladislav Vinogradov
c319625a07
disable some gpu tests if library was built without CUFFT(cherry picked from commit b4b929d27cc25822dd15b5b96b8d335c59d4408c)
2014-01-31 22:23:05 +04:00
Vladislav Vinogradov
a7d0448faa
gpu test output files moved from cwd to temp folder(cherry picked from commit 49731ad530)
2014-01-31 22:22:49 +04:00
Alexander Smorkalov
ca10e5e8ae
Highgui test output fixes.
...
Useless output to console fixed;
Test output files moved from cwd to temp folder.
(cherry picked from commit 87935f3560
2014-01-31 22:22:33 +04:00
Vladislav Vinogradov
32414afe72
disable performance test for gpu generalized hough(cherry picked from commit 063d8b4211)
2014-01-31 22:22:14 +04:00
Alexander Smorkalov
ed10f50d25
Reports path fix for opencv_run_all_tests.sh.in script.
...
(cherry picked from commit 3d261e8a01
2014-01-31 22:21:57 +04:00
Alexander Smorkalov
48d9be70d5
Android toolchain file sync with original project.
...
Original project: https://github.com/taka-no-me/android-cmake/
Revision: 5db45cfb87fec180b74963d3680dd60d4d8d8c3a
(cherry picked from commit c815043607
2014-01-31 22:21:34 +04:00
Roman Donchenko
2bef73c968
Merge pull request #2249 from jet47:gpu-tests-disable
2014-01-31 20:49:05 +04:00
Roman Donchenko
a518d7a1cb
Merge pull request #2248 from jet47:gpu-npp-disable
2014-01-31 20:48:52 +04:00
Roman Donchenko
9ef8aeadd3
Merge pull request #2247 from jet47:gpu-test-cufft
2014-01-31 20:48:38 +04:00
Roman Donchenko
e2db68f822
Merge pull request #2242 from jet47:gpu-test-fix
2014-01-31 17:24:21 +04:00
Vladislav Vinogradov
952027a853
disable gpu CvtColor.*2HSV tests:
...
possible bug in CPU version
2014-01-31 16:20:45 +04:00
Vladislav Vinogradov
e91bf95d58
disable gpu Subtract_Array test:
...
possible bug in CPU version
2014-01-31 16:15:11 +04:00
Vladislav Vinogradov
dbce90692a
disable gpu Canny and HoughCircles perf tests:
...
it fails because driver terminates CUDA kernels after time out
2014-01-31 16:14:07 +04:00
Vladislav Vinogradov
e630be3890
disable NPP for GpuMat methods and for copyMakeBorder
2014-01-31 15:52:06 +04:00
