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
StevenPuttemans
dd0481ef2d
Added brackets around line 888-892 for correct code!
2013-07-18 15:34:38 +02: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
peng xiao
e1f43e3b03
Add sort_by_key for oclMat.
...
Most codes are ported from AMD's Bolt library.
Four methods are implemented:
SORT_BITONIC, // only support power-of-2 buffer size
SORT_SELECTION, // cannot sort duplicate keys
SORT_MERGE,
SORT_RADIX // only support signed int/float keys
2013-07-18 17:25:00 +08: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
StevenPuttemans
c3dee28394
Fixed bug #3101 , problem on ellipse2poly function
2013-07-17 15:21:23 +02: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
yao
f1060ac514
a little simplify to pyrlk kernel
2013-07-17 14:35:44 +08:00
kdrobnyh
487ded8b27
Add IPP erosion and dilation
2013-07-16 22:35:16 +04: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
peng xiao
ff73557304
Fix compilation error on Mac
2013-07-16 08:48:09 +08:00
peng xiao
e5c396bb24
Add ocl::gftt performance test.
2013-07-15 16:27:27 +08:00
Roman Donchenko
886c009da6
Merge pull request #1049 from pengx17:2.4_superres_ocl
2013-07-15 11:43:09 +04:00
yao
cdd9234fae
fix hog mismatch on cpu ocl
2013-07-15 15:13:09 +08: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
Roman Donchenko
0b4d0a8171
Sorted cvconfig.h.cmake in alphabetical order.
2013-07-11 16:01:46 +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
Roman Donchenko
78cb920bc8
Removed useless VERSION macro (and CMake variable)
2013-07-11 14:30:46 +04:00
Roman Donchenko
06742247be
Removed unused PACKAGE_* macros.
2013-07-11 14:30:46 +04:00
Roman Donchenko
6f326220d3
Removed the HAVE_LRINT macro, which is never set.
2013-07-11 14:30:46 +04:00
