Andrey Pavlenko
f01cd3d99e
Merge pull request #1158 from StevenPuttemans:bugfix_3165
2013-07-21 18:47:16 +04:00
Andrey Pavlenko
cdcb5ed134
Merge pull request #1156 from StevenPuttemans:bugfix_1873_new
2013-07-21 18:46:58 +04:00
StevenPuttemans
27ed32f833
Applied bugfix #3165 : Changed min_eps value
2013-07-19 14:11:04 +02:00
Roman Donchenko
1c35f121bb
Merge pull request #1148 from StevenPuttemans:patch_3125
2013-07-19 12:48:49 +04:00
Roman Donchenko
7e15f2ac73
Merge pull request #1141 from apavlenko:fix_warning_unreach_code
2013-07-19 12:22:58 +04:00
Roman Donchenko
1b38d1e6b7
Merge pull request #1150 from janstarzy:spelling
2013-07-19 12:15:31 +04:00
StevenPuttemans
52bfa7b850
Fixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration
2013-07-19 09:29:48 +02:00
Andrey Pavlenko
6b047ca0eb
minor improvement (consistency, readability)
2013-07-18 19:50:51 +04:00
Andrey Pavlenko
74c72a1d7a
removing unreachible code
2013-07-18 19:15:49 +04:00
Jan Starzynski
9bf216742f
fixed cpackage -> package
2013-07-18 15:33:25 +02:00
StevenPuttemans
f9b594bf08
Changed first approach to a more general MS-specific approach.
...
Suggested by @SpecLad
2013-07-18 14:24:19 +02:00
Roman Donchenko
28f2755413
Merge pull request #1137 from StevenPuttemans:bugfix_3131_24
2013-07-18 16:02:47 +04:00
Jan Starzynski
ee42b65063
corrected some spelling errors
2013-07-18 13:24:55 +02:00
Roman Donchenko
7eddf887d5
Merge pull request #1147 from jet47:gpu-sanity-test-name
2013-07-18 14:29:47 +04:00
Andrey Pavlenko
6fbda0dfc1
Merge pull request #1138 from janstarzy:mat-dist
2013-07-18 14:23:12 +04:00
Vladislav Vinogradov
f87ef77269
removed GPU_/CPU_ prefix from gpu's sanity test
2013-07-18 13:41:27 +04:00
StevenPuttemans
5caa808879
Fixing bug #3131 adding breakpoints to featuretracker.cpp
2013-07-18 11:36:22 +02:00
Roman Donchenko
12f304ec54
Merge pull request #1146 from jet47:fix-gpu-without-cufft-cublas
2013-07-18 12:54:10 +04:00
Roman Donchenko
c48d3ad71e
Merge pull request #1145 from jet47:cuda-default-cc
2013-07-18 12:25:21 +04:00
Vladislav Vinogradov
ebe7ff991f
fixed compilation without CUBLAS and CUFFT
2013-07-18 12:04:33 +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
Jan Starzynski
12c42ac145
fixed strings in n1_dims(): n1_dcols() -> n1_dims()
2013-07-17 18:41:54 +02: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
Jan Starzynski
1ccfa62f4f
adding method dims() to core.Mat
2013-07-17 15:04:34 +02: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
StevenPuttemans
1fc89bb2e0
Added the solution mentioned in patch #3125
2013-07-17 13:20:25 +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
2013-07-10 15:49:00 +04:00
