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
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
Vladislav Vinogradov
8401ed9395
disable some gpu tests if library was built without CUFFT
2014-01-31 15:40:59 +04:00
Roman Donchenko
7161b5bbad
Merge pull request #2241 from asmorkalov:ocv_highgui_test_output_fix
2014-01-31 14:56:10 +04:00
Roman Donchenko
7e6293d9ec
Merge pull request #2240 from jet47:gpu-generalized-hough
2014-01-31 14:24:04 +04:00
Roman Donchenko
b13d4bafa8
Merge pull request #2238 from asmorkalov:ocv_test_package_reports
2014-01-31 13:56:48 +04:00
Vladislav Vinogradov
49731ad530
gpu test output files moved from cwd to temp folder
2014-01-31 13:19:15 +04:00
Alexander Smorkalov
3d261e8a01
Reports path fix for opencv_run_all_tests.sh.in script.
2014-01-31 13:17:12 +04:00
Alexander Smorkalov
87935f3560
Highgui test output fixes.
...
Useless output to console fixed;
Test output files moved from cwd to temp folder.
2014-01-31 12:49:10 +04:00
Vladislav Vinogradov
063d8b4211
disable performance test for gpu generalized hough
2014-01-31 12:40:40 +04:00
Roman Donchenko
d14e007fdb
Merge pull request #2231 from asmorkalov:android_toolchain_update
2014-01-30 13:22:11 +04:00
Roman Donchenko
40f6f679b8
Merge pull request #2224 from SpecLad:obsolete-immediate
2014-01-30 12:43:51 +04:00
Roman Donchenko
2b3013fd20
Merge pull request #2229 from ilya-lavrenov:possible_memory_leak
2014-01-30 12:23:20 +04:00
Alexander Smorkalov
c815043607
Android toolchain file sync with original project.
...
Original project: https://github.com/taka-no-me/android-cmake/
Revision: 5db45cfb87fec180b74963d3680dd60d4d8d8c3a
2014-01-30 11:08:49 +04:00
Ilya Lavrenov
e7e63fac6c
eliminated possible memory leak
2014-01-30 01:21:04 +04:00
Roman Donchenko
0dad2876e2
Removed all use of the obsolete IMMEDIATE parameter to configure_file.
...
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):
https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
2014-01-29 19:34:02 +04:00
Roman Donchenko
5ae9add102
Merge pull request #2221 from asmorkalov:ocv_test_install_custom
2014-01-29 17:09:28 +04:00
Alexander Smorkalov
d45350a06a
opencv_run_all_tests.sh script added to -tests package.
2014-01-29 16:31:24 +04:00
Roman Donchenko
3e59ddbace
Merge pull request #2215 from asmorkalov:ocv_testpack_fix
2014-01-28 17:51:07 +04:00
Alexander Smorkalov
d9dc5ffa91
Multiple fixes for tests deb package build.
...
Added opencv_testing.sh.in file;
opencv_testing.sh installation guarded by OS check.
2014-01-28 16:32:26 +04:00
Roman Donchenko
7a0a9d010b
Merge pull request #2205 from jet47:bug-3477-fix
2014-01-28 12:23:32 +04:00
Andrey Pavlenko
51aa649499
Merge pull request #2097 from pclove1:blur_border_isolated
2014-01-28 10:51:11 +04:00
Vladislav Vinogradov
c41e8006c7
fix #3477 :
...
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING property is not supported
by all VideoCapture backends. Some backends can return 0.0 or -1.0.
2014-01-28 10:28:00 +04:00
Seunghoon Park
eb9d7c4dd5
fixing bug #3345 . use norm to make sure two matrices are the same.
2014-01-27 20:57:40 -05:00
Seunghoon Park
73389b2b9c
Merge branch '2.4' into blur_border_isolated
2014-01-27 20:44:03 -05:00
Roman Donchenko
452ea4c15f
Merge pull request #2209 from asmorkalov:ocv_test_install
2014-01-27 20:59:53 +04:00
Alexander Smorkalov
39201e68e2
Code review notes fixed.
...
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
2014-01-27 18:47:09 +04:00
Alexander Smorkalov
f332cba14b
OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.
2014-01-27 15:49:24 +04:00
Andrey Pavlenko
d093cb54d5
Merge pull request #2194 from apavlenko:2.4_perf_haar_iter
2014-01-24 16:13:19 +04:00
Roman Donchenko
24caa80143
Merge pull request #2197 from asmorkalov:ocv_packaging2
2014-01-24 14:27:44 +04:00
Alexander Smorkalov
086792ec06
Improvements in package build.
2014-01-24 12:00:44 +04:00
Andrey Pavlenko
0a4a1d7526
temporary disabling hanging test
2014-01-24 10:07:21 +04:00
Roman Donchenko
078d49609e
Merge pull request #2193 from apavlenko:2.4_lic_remove
2014-01-23 17:13:52 +04:00
Andrey Pavlenko
dca5684145
removing duplicated legacy license, the actual instance is in 'opencv/LICENSE'
2014-01-23 17:05:20 +04:00
Roman Donchenko
7ff9d7eb2d
Merge pull request #2188 from jet47:gpumat-copyto-fix
2014-01-23 13:28:12 +04:00
Roman Donchenko
3715f71aaf
Merge pull request #2175 from vrabaud:2.4
2014-01-23 13:27:38 +04:00
Vincent Rabaud
167a26642e
fix message sent to user during cross_compilation
2014-01-22 15:26:14 +01:00
Roman Donchenko
a4b34e7ae1
Merge pull request #2181 from asmorkalov:ocv_packaging
2014-01-22 11:54:07 +04:00