Roman Donchenko
84639e444b
Merge pull request #1010 from jet47:gpufilters-refactoring
2013-06-21 14:45:50 +04:00
Roman Donchenko
0e3a9eaf98
Made Collector render property sets as dicts instead of tuples of pairs.
2013-06-21 13:43:16 +04:00
peng xiao
290c8db0a8
Revise naming for getOclMat function.
2013-06-21 14:51:23 +08:00
yao
6326739b44
a bug fix in stereo_match sample
2013-06-21 14:50:08 +08:00
peng xiao
e129638263
Add a workaround to interpolate between oclMat and Input/OutputArray.
2013-06-21 14:05:29 +08:00
Roman Donchenko
2688e22cb5
Made xls-report.py use global properties in XML files.
...
Now it can determine, without looking at the file name, both the module
name and the configuration name (the latter with a little help from the
configuration file).
2013-06-20 19:57:45 +04:00
Roman Donchenko
57317c3196
Use log formatting as intended.
2013-06-20 19:39:02 +04:00
Roman Donchenko
3ea4836a0a
Changed the impls argument to be an array name.
...
Turns out, you can't use preprocessor directives inside macro arguments.
Who'd have thought?
2013-06-20 15:18:35 +04:00
Roman Donchenko
3e2c456313
A few minor improvements to the XLS report generator.
...
* In comparison column headers, switched the order of labels, so that
it's "to" vs "from".
* When a test was present, but not run successfully, put its status in
the corresponding cell instead of coloring it gray.
2013-06-20 14:38:01 +04:00
Roman Donchenko
13323882d4
Merge pull request #1027 from jet47:fix-cuda-4.2-build
2013-06-20 14:11:52 +04:00
Roman Donchenko
e600beb484
Merge pull request #1017 from jet47:fix-gpu-warnings
2013-06-20 12:13:14 +04:00
Vladislav Vinogradov
f08d75a84b
removed obsolete API
2013-06-20 11:24:29 +04:00
peng xiao
c1f4fe1637
Fix a bug of convertTo.
...
The bug was found that all 3-channel oclMat's were converted to
4-channel oclMat's after using convertTo function.
2013-06-20 11:26:22 +08:00
Roman Donchenko
51a672ec40
Disabled the cuda variant when CUDA is not available.
2013-06-19 19:16:18 +04:00
Roman Donchenko
7a104d2793
Added an option to print available implementation variants.
2013-06-19 18:47:15 +04:00
Roman Donchenko
b581f27249
Made perf tests record module name, selected implementation and number of threads.
2013-06-19 17:55:42 +04:00
Roman Donchenko
936236e4b1
Extended the CPU/GPU selection mechanism in performance tests.
...
Now it allows choosing between arbitrary implementation variants.
2013-06-19 17:55:42 +04:00
Roman Donchenko
37d19b9c46
Pass the HAVE_QT* flags through the config header, like all others.
...
I don't know why it didn't work for the original author, but it definitely
works now.
2013-06-19 17:44:12 +04:00
Roman Donchenko
1d9660c6d2
Merge pull request #954 from LeszekSwirski:24_fix-qtwindow
2013-06-19 17:01:57 +04:00
Roman Donchenko
1ed5fb937d
Give cv::ocl::CLAHE a virtual destructor, for the usual reasons.
2013-06-19 15:39:11 +04:00
Vladislav Vinogradov
50166d2734
fixed compilation with CUDA 4.2
2013-06-19 15:29:20 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Roman Donchenko
d58421c08e
Make version-related test properties more useful.
...
Namely, normalize their names to a common convention and remove useless text
from their values.
2013-06-19 14:45:03 +04:00
Roman Donchenko
1aa7b1596b
Merge pull request #1023 from pengx17:2.4_fix_amd_path
2013-06-19 14:43:29 +04:00
yao
f1c549fabf
revise ocl samples, add tvl1 sample
2013-06-19 16:36:23 +08:00
Roman Donchenko
84262acbf0
Merge pull request #1012 from apavlenko:fix_3077
2013-06-19 12:25:23 +04:00
Roman Donchenko
fa158304fe
Merge pull request #1016 from SpecLad:xls-report
2013-06-19 12:24:34 +04:00
Roman Donchenko
dd23a3c227
Merge pull request #1020 from SpecLad:tests-record-more
2013-06-19 12:24:05 +04:00
Vladislav Vinogradov
4b983679a5
fix gpuarithm module compilation (Bug #3103 )
2013-06-19 10:13:33 +04:00
yao
2c198f6cd6
revise accuracy and perf tests
2013-06-19 13:03:35 +08:00
peng xiao
9ecbce0111
Fix cmake path finding for amd libs.
...
There is no WIN64 defined in the environment.
2013-06-19 11:31:42 +08:00
yao
26c246140a
optimize hog
2013-06-19 11:20:45 +08:00
Alexander Shishkov
68741bf8a0
moved iOS part to platforms folder
2013-06-19 00:20:21 +04:00
Roman Donchenko
25613fbfd7
Merge pull request #1008 from ivan-korolev:fix_sift_bug_2892
2013-06-18 18:32:03 +04:00
Roman Donchenko
4af7d65224
Made tests record information about CPU features and Tegra optimization status.
2013-06-18 18:26:53 +04:00
Roman Donchenko
24d84a45b1
Made tests record in the XML output which parallel framework was used.
2013-06-18 18:26:53 +04:00
Vladislav Vinogradov
371a9cd833
fixed build with CUDA 5.5 on arm platforms
2013-06-18 17:46:57 +04:00
Vladislav Vinogradov
1492b20472
fix gpu warnings with signed/unsigned char
2013-06-18 17:44:49 +04:00
Alexander Smorkalov
8f7ba03ed2
Some fixes for incorrectly documented parameters identified by rst_parser.py (Bug #1205 )
2013-06-18 16:48:24 +04:00
Roman Donchenko
748210e11b
Merge pull request #994 from asmorkalov:android_java_wrappers
2013-06-18 16:46:04 +04:00
Alexander Smorkalov
16c4aad36d
Java/Python bindings for computeCorrespondEpilines added.
...
Simle Java test for computeCorrespondEpilines added.
2013-06-18 16:44:23 +04:00
Roman Donchenko
5b39c02c39
Merge pull request #1007 from alekcac:i_camera
2013-06-18 15:54:01 +04:00
Roman Donchenko
584f0745d0
Made xls-report.py ignore tests that were not successful.
2013-06-18 13:41:41 +04:00
Roman Donchenko
0f1156bbb6
Made the order of tests in XLS reports deterministic.
2013-06-18 13:37:40 +04:00
Roman Donchenko
4d7b1b5ede
In the XLS report, enabled word wrapping for header cells.
...
Otherwise, Excel ignores line breaks in them.
2013-06-18 12:31:43 +04:00
Roman Donchenko
6ff207b53a
Added a new and improved version of the XLS report generator.
2013-06-18 12:31:43 +04:00
Roman Donchenko
f003e29dc0
Updated testlog_parser.py to the latest version from the private repo.
2013-06-18 12:31:43 +04:00
Vladislav Vinogradov
4e29f0ee6d
updated documentation
2013-06-18 08:36:49 +04:00
Alexander Shishkov
24fd2cc326
updated licenses
2013-06-18 07:02:09 +04:00
Alexander Shishkov
5db08961ce
fixed Kirill's comments
2013-06-18 06:59:52 +04:00