mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,849 Commits 6 Branches 126 Tags 3 GiB
9bf216742f
Commit Graph

5209 Commits

Author SHA1 Message Date
Roman Donchenko
6bf8f474fa Merge pull request #1051 from pengx17:2.4_fback_ocl 2013-07-01 13:45:43 +04:00
Roman Donchenko
c8cd2cf601 Merge pull request #1061 from bitwangyaoyao:2.4_fix2 2013-07-01 13:21:12 +04:00
Roman Donchenko
087bab6ceb Merge pull request #1060 from pengx17:2.4_setbinary_fix 2013-07-01 13:20:51 +04:00
Roman Donchenko
38cf0a692e Merge pull request #1055 from pengx17:2.4_ocl_hang_workaround 2013-07-01 13:20:04 +04:00
Roman Donchenko
43632bf973 Merge pull request #1065 from apavlenko:fix_eclipse_warning 2013-06-28 19:32:44 +04:00
Andrey Pavlenko
6069967109 removing unused import 2013-06-28 17:28:57 +04:00
Roman Donchenko
4b51b1e3a8 Merge pull request #1059 from dominikrose:dc1394_2-1394b 2013-06-28 14:47:45 +04:00
Roman Donchenko
1707b1769f Merge pull request #1063 from alekcac:conversion 2013-06-28 14:41:35 +04:00
Roman Donchenko
a96466a73a Merge pull request #1062 from kirill-kornyakov:fixes-for-documentation 2013-06-28 14:35:51 +04:00
Roman Donchenko
156155addb Merge pull request #1018 from jet47:cuda-5.5-arm 2013-06-28 14:26:45 +04:00
yao
c66e27d49e stereoBM fix an error on Linux when running full performance test 2013-06-28 17:45:39 +08:00
Alexander Shishkov
7b06592dea added conversions between UIImage and cv::Mat 2013-06-28 13:26:54 +04:00
Kirill Kornyakov
aef347e7b3 Removed references to opencv.itseez.com 2013-06-28 12:48:12 +04:00
Kirill Kornyakov
cbed07bc18 Removed references to YG from samples 2013-06-28 12:21:52 +04:00
Roman Donchenko
3b78fe2684 Merge pull request #1054 from asmorkalov:opencv_version 2013-06-28 11:29:55 +04:00
yao
c1a59b8d80 more fix to HOG 2013-06-28 13:38:58 +08:00
yao
f1d9680ba8 format the ocl's samples name 2013-06-28 11:44:43 +08:00
yao
587fb4940d some accuracy fix of HOG 2013-06-28 11:43:43 +08:00
peng xiao
a5383b8627 Move function definition from header to cpp. 2013-06-28 10:52:39 +08:00
peng xiao
e858a6c347 Renew function logic. 2013-06-28 10:39:09 +08:00
peng xiao
14dd345cdf Fix ocl::setBinaryDiskCache 
Previously the function requires Info::Impl implicitly. A call will create
new Context this function which is not intended.
The properties are now moved to global scope to fix this issue.
 2013-06-28 10:12:18 +08:00
Dominik Rose
d39aeeca0f Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b 2013-06-27 19:43:05 +02:00
Dominik Rose
e32700cf8f dc1394-2: support for operation mode 1394b added 2013-06-27 15:05:32 +02:00
Roman Donchenko
d76468c223 Merge pull request #1040 from asmorkalov:winrt 2013-06-27 16:59:25 +04:00
Alexander Smorkalov
7c5bd78804 Test fixes 
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
 2013-06-27 15:47:37 +04:00
Roman Donchenko
664b720e4d Extended Google Test to allow filtering by parameter value. 2013-06-27 13:14:37 +04:00
Roman Donchenko
f477696cc5 Merge pull request #1050 from pengx17:2.4_clach_mod 2013-06-27 12:22:01 +04:00
Alexander Smorkalov
e241c14b94 OpenCV Library and Manager version incremented. 
OpenCV Version 2.4.6;
OpenCV Manager Version 2.8;
Doc fixes.
 2013-06-27 12:05:25 +04:00
peng xiao
b2da1cdcc2 Temporarily disable command queue release as it causes program hang at exit 2013-06-27 10:20:21 +08:00
peng xiao
fc64faa22e Remove empty cv::ocl::CLAHE class. 2013-06-27 10:06:37 +08:00
peng xiao
dcc4766129 Fix white-spacing 2013-06-27 09:57:42 +08:00
Roman Donchenko
76efc9853a Merge pull request #1053 from snosov1:unreliable-results-fix 2013-06-26 17:00:15 +04:00
Roman Donchenko
bf6b119a3f Merge pull request #1045 from bitwangyaoyao:2.4_fix 2013-06-26 16:55:06 +04:00
Roman Donchenko
1cfe5aa41e Merge pull request #1048 from SpecLad:xls-conf 2013-06-26 16:53:50 +04:00
Alexander Smorkalov
347c86d9b5 Windows RT related code cleanup. 
Windows RT sample cleanup.
Video I/O code cleanup.
 2013-06-26 05:44:10 -07:00
Roman Donchenko
a335fc591f Merge pull request #1052 from SpecLad:ocl-mingw-warnings 2013-06-26 16:13:47 +04:00
Sergei Nosov
29955620e0 multiruns added to avoid the 'unreliable results' error 2013-06-26 15:07:39 +04:00
Roman Donchenko
5b2b76763e Fix miscellaneous warnings from compiling with MinGW. 
Note that MinGW defines NOMINMAX by default.
 2013-06-26 14:59:00 +04:00
peng xiao
9270205947 Fix build errors 2013-06-26 17:24:09 +08:00
yao
2ec1140b25 fix pyrlk 2013-06-26 16:58:20 +08:00
peng xiao
132b885b24 Add opencl implementation of Farnback optical flow. 2013-06-26 16:35:19 +08:00
peng xiao
30239ad58e Fix build error. 2013-06-26 16:06:05 +08:00
peng xiao
cc3fb3d182 Let CLAHE_OCL reuse cv::CLAHE abstract class. 2013-06-26 10:50:51 +08:00
peng xiao
9b3c318e85 Add super resolution's OpenCL implementation. 
Accuracy and performance tests are also provided.
 2013-06-26 08:43:23 +08:00
Alexander Smorkalov
ee591efb9f Build fix for Windows RT. 2013-06-25 03:35:58 -07:00
Alexander Smorkalov
34c6598752 Perf test failure fixes for Media Foundation. 2013-06-25 03:35:57 -07:00
Alexander Smorkalov
2bc1d3709c GetProperty method for MSMF VideoCapture implemented. 2013-06-25 03:35:56 -07:00
Alexander Smorkalov
43122939cb Media foundation video i/o fixes. 
Bug in Video for Windows capture init fixed;
Media Foundation based capture finalization fixed;
Highgui tests for video i/o updated.
 2013-06-25 03:35:30 -07:00
yao
1227e00f3d fix moments 2013-06-25 16:26:33 +08:00
Roman Donchenko
381057eaad Merge pull request #1002 from asmorkalov:doc_warning_fix 2013-06-25 11:42:00 +04:00
Roman Donchenko
f8e187e1e1 Merge pull request #1035 from SpecLad:cv-concurrency 2013-06-25 11:33:16 +04:00
yao
dbdeff2069 fix stereobm crash on some cpu ocl 2013-06-25 14:12:02 +08:00
yao
6db776f957 add "-c" for cpu ocl mode in perf tests 2013-06-25 14:11:28 +08:00
Roman Donchenko
c244f000ab Merge pull request #1030 from SpecLad:ts-impl-variants 2013-06-24 18:28:13 +04:00
Roman Donchenko
961251f0ca Merge pull request #1029 from SpecLad:have-qt-config 2013-06-24 17:03:51 +04:00
Alexander Smorkalov
996f02a531 Multiple Media Foundation video i/o fixes. 
Video i/o tests enabled for media foundation;
Negative stride support added to VideoCapture;
Error handling improved, dead lock in case of playback error fixed;
Some code refacotring done.
 2013-06-24 02:45:27 -07:00
Alexander Smorkalov
0c9d776083 Media Foundation-based code refactoring. 
I* + SafeRelease -> ComPtr.
 2013-06-24 02:45:26 -07:00
Alexander Smorkalov
e94cc0b5ee Media Foundation camera capture fixed. 
Camera-based VideoCapture updated to fit changes in ImageGrabber from prev
commit
 2013-06-24 02:45:25 -07:00
Alexander Smorkalov
9fb762ccec VideoCapture for video files implemented. 
Set and Get methods are not implemented;
Camera based video capture is broken due to modifications.
 2013-06-24 02:45:24 -07:00
Alexander Smorkalov
22b0cfbaa2 Media Foundation-based VideoWriter improvements. 
FourCC parameter handlig added;
Smart pointers instead SafeRelease call;
Windows RT support (vertical mirroring).
 2013-06-24 02:45:23 -07:00
Alexander Smorkalov
ccb8292e8e Media Foundation-based VideoWriter added 2013-06-24 02:45:22 -07:00
Alexander Smorkalov
033e3092a3 Media Foundation based VideoCapture improved 
Code formating fixed;
GrabFrame method implemented correclty.
 2013-06-24 02:45:21 -07:00
Roman Donchenko
3bab7391d0 Merge pull request #1028 from SpecLad:ocl-clahe-dtor 2013-06-24 13:18:28 +04:00
Roman Donchenko
c16316c4b4 Replaced the semi-public CV_PARALLEL_FRAMEWORK macro with a function. 
That way, core/internal.hpp doesn't have to depend on cvconfig.h, which we
don't ship.
 2013-06-24 12:57:14 +04:00
Roman Donchenko
171a56fe82 Merge pull request #1034 from pengx17:2.4_oclmat_inoutarray 2013-06-24 12:27:26 +04:00
Roman Donchenko
7cb047e2d9 Merge pull request #1031 from pengx17:2.4_fix_converTo 2013-06-24 12:25:48 +04:00
Roman Donchenko
4ed3d33dd7 Merge pull request #1025 from bitwangyaoyao:2.4_tests 2013-06-24 12:11:04 +04:00
Roman Donchenko
b0421cafab Merge pull request #1022 from bitwangyaoyao:2.4_hog 2013-06-24 12:08:59 +04:00
Roman Donchenko
5fa200763f Merge pull request #1026 from SpecLad:ts-version-prop 2013-06-21 18:00:59 +04:00
Roman Donchenko
e3ae36dcb3 Merge pull request #1033 from SpecLad:xls++ 2013-06-21 17:13:33 +04:00
Roman Donchenko
d4a8b87645 Wrote relevant docs. 2013-06-21 16:45:17 +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
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
e600beb484 Merge pull request #1017 from jet47:fix-gpu-warnings 2013-06-20 12:13:14 +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
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
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
yao
2c198f6cd6 revise accuracy and perf tests 2013-06-19 13:03:35 +08:00
yao
26c246140a optimize hog 2013-06-19 11:20:45 +08: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