Roman Donchenko
c48d3ad71e
Merge pull request #1145 from jet47:cuda-default-cc
2013-07-18 12:25:21 +04:00
Vladislav Vinogradov
4b0f6e2d43
updated default parameters for CUDA CC in CMake:
...
* removed 2.0 PTX from default parameters since it has become obsolete
* added 3.5 BIN to prevent JIT compilation for super-Kepler
2013-07-18 09:44:00 +04:00
Roman Donchenko
ee13ee3c6d
Merge pull request #1131 from asmorkalov:winrt_tbb_dbg_fix
2013-07-17 18:48:21 +04:00
Roman Donchenko
8b29a6e44a
Merge pull request #1127 from SpecLad:np-1.7
2013-07-17 18:48:08 +04:00
Roman Donchenko
f625be0264
Merge pull request #1136 from StevenPuttemans:bugfix_3157
2013-07-17 17:51:28 +04:00
StevenPuttemans
a58860d35a
Removed Note, added other fix (libs to lib)
2013-07-17 15:02:55 +02:00
Alexander Smorkalov
a64eccd2cd
Debug build for WindowsRT with TBB fixed.
...
Debug library name prefix changed no "_debug" to fit pragmas in TBB
headers.
2013-07-17 05:21:26 -07:00
StevenPuttemans
d42b283abf
Changed tutorial for installing openCV under VS2010 like bug 3157 suggested
2013-07-17 13:38:45 +02:00
Roman Donchenko
5d8af49016
Merge pull request #1128 from SpecLad:ocl-tr1
2013-07-17 15:08:38 +04:00
Roman Donchenko
b45d61d2ad
Merge pull request #1105 from kdrobnyh:Integral-Image-IPP
2013-07-17 13:10:24 +04:00
Roman Donchenko
2cd1c49623
Merge pull request #1126 from asmorkalov:winrt
2013-07-17 13:08:30 +04:00
Roman Donchenko
77fe7f479c
Merge pull request #1129 from vpisarev:revert_bad_qtkit_patch
2013-07-17 12:16:59 +04:00
Alexander Smorkalov
16cfc7a531
WindowsRT build warning fixes.
2013-07-17 00:18:46 -07:00
Vadim Pisarevsky
be040ff513
revert patch from PR 1074, since it break capturing on MacOSX
2013-07-16 15:02:33 +04:00
Roman Donchenko
28a5c127ea
Made the Python bindings not use deprecated NumPy 1.7 API.
2013-07-16 14:33:15 +04:00
Roman Donchenko
523048f99f
Fixed a compilation error (get<N> not found).
2013-07-16 14:23:05 +04:00
Roman Donchenko
886c009da6
Merge pull request #1049 from pengx17:2.4_superres_ocl
2013-07-15 11:43:09 +04:00
Roman Donchenko
09ec483d02
Merge pull request #1109 from nikman-ru:cap_reuse_24x
2013-07-12 11:38:59 +04:00
Roman Donchenko
18f1964f8a
Merge pull request #1111 from nikman-ru:fix_yamldoc
2013-07-12 11:38:14 +04:00
Nikita Manovich
c55dc3e8ab
Fixed "FileStorage (minor) error in doc (Feature #3151 )"
...
It was just a typo in the documentation.
2013-07-11 16:06:25 +04:00
Nikita Manovich
05aeb70831
Fixed VideoCapture::open() does not release previous capture sources (Bug #3150 ).
...
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
bool VideoCapture::open(const string& filename);
bool VideoCapture::open(int device);
The methods first call VideoCapture::release() to close the already opened file or camera.
2013-07-11 15:16:22 +04:00
Andrey Pavlenko
d1fe1a62c3
Merge pull request #1106 from pengx17:2.4_gftt_rename
2013-07-11 11:41:37 +04:00
Andrey Pavlenko
07c2ae508e
Merge pull request #1102 from SpecLad:xls-updates
2013-07-11 11:36:47 +04:00
kdrobnyh
df4b67a749
Merge pull request #1 from Itseez/2.4
...
Add calculating integral image using IPP
2013-07-10 10:45:24 -07:00
Roman Donchenko
241e2d2360
Merge pull request #1077 from bitwangyaoyao:2.4_kmeans
2013-07-10 18:32:14 +04:00
Roman Donchenko
894b30b34d
Merge pull request #1088 from apacha:brisk_noDescriptors_fix
2013-07-10 18:18:31 +04:00
Roman Donchenko
f0c7cce87a
Merge pull request #1080 from hhofbaue:matchTemplate_bugfix
2013-07-10 18:17:06 +04:00
Roman Donchenko
a0f6e1ba1d
Merge pull request #1103 from apavlenko:ver_2.4.6.1
2.4.6.1
2013-07-10 15:49:00 +04:00
Andrey Pavlenko
2b2e02166e
setting version to 2.4.6.1 (hot-fix release for Linux camera support)
2013-07-10 15:12:39 +04:00
Roman Donchenko
ea3239a00e
xls-report.py: Added an option to show per-pixel times
2013-07-10 14:58:51 +04:00
Roman Donchenko
5b2dc26f2c
Made the crude ability less crude.
2013-07-10 14:58:51 +04:00
Roman Donchenko
215b3e749f
Added to the test log parser a crude ability to detect non-implemented tests.
2013-07-10 14:58:51 +04:00
Roman Donchenko
1080c4295a
xls-report.py: removed image size and type from the list of other parameters.
...
Also, shrunk the corresponding column and the test name column.
2013-07-10 14:58:18 +04:00
Roman Donchenko
63d151a29c
xls-report.py: add ability to specify arbitrary sheet properties
2013-07-10 14:58:17 +04:00
kdrobnyh
f8eb806565
Add IPP support to integral function
2013-07-10 11:25:36 +04:00
peng xiao
5032240c9d
Fix ocl gftt file name typo.
2013-07-10 14:51:40 +08:00
Roman Donchenko
2dedfd9762
Merge pull request #1099 from asmorkalov:linux_vcap_fix
2013-07-09 17:13:05 +04:00
Alexander Smorkalov
f77d1f57ee
V4L and V4L2 based Video capture bug fix (Bugfix #3144 ).
2013-07-09 16:07:55 +04:00
Roman Donchenko
b1f04c5388
Merge pull request #1097 from apavlenko:ocl_tests_fixes
2013-07-09 14:00:38 +04:00
Andrey Pavlenko
fcb4c0e51c
fixing working with test data and a small fix for init code
...
- set init value for `numsdev` to prevent use of uninitialized value
- stop use of 'workdir' and files from samples
- forcing use of 'opencv_extra' instead
Note: set OPENCV_TEST_DATA_PATH to full path to 'opencv_extra/testdata' (gitolite@code.opencv.org:opencv_extra.git) before running the test!
2013-07-09 13:25:21 +04:00
Andrey Pavlenko
1a2458885b
Merge pull request #1094 from asmorkalov:android_na_fix
2013-07-08 11:25:40 +04:00
Alexander Smorkalov
69b308a368
Various fixes in android sample NativeActivity.
2013-07-05 14:08:37 +04:00
Roman Donchenko
f5089100b9
Merge pull request #1073 from asmorkalov:android_cvjavaframe
2013-07-05 13:41:51 +04:00
Roman Donchenko
c4e59866a2
Merge pull request #1074 from devernay:2.4-cap_qt-multithread
2013-07-05 13:28:38 +04:00
Andrey Pavlenko
b6b1d5e75d
Merge pull request #1092 from asmorkalov:manager_version_inc
2013-07-05 13:02:10 +04:00
Roman Donchenko
36a4d246f4
Merge pull request #1087 from znah:2.4
2013-07-05 12:07:45 +04:00
Alexander Smorkalov
e905c81ccc
OpenCV Manager version++.
2013-07-05 12:07:04 +04:00
Roman Donchenko
dbf02c71b6
Merge pull request #1091 from SpecLad:xls-updates
2013-07-05 12:00:52 +04:00
yao
88ed74a7ec
fix the function name
2013-07-05 08:59:21 +08:00
Roman Donchenko
2b44172026
xls-report.py: make behaviour more intelligent in case of repeated results
2013-07-04 20:01:27 +04:00