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
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
Roman Donchenko
eb8d9730cb
Removed unused NEW_FFMPEG macro.
2013-07-11 12:55:34 +04:00
Roman Donchenko
e2ef2a5781
Refactored image format library finding logic.
...
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there,
but were nonfunctional.
2013-07-11 12:40:16 +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
ca8b621b4f
Refactored detecting several Apple-related technologies.
...
Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.
This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.
2013-07-10 19:45:56 +04:00
Roman Donchenko
241e2d2360
Merge pull request #1077 from bitwangyaoyao:2.4_kmeans
2013-07-10 18:32:14 +04:00
Roman Donchenko
4f9554eead
Removed a few more unused configuration macros.
...
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.
Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
2013-07-10 18:29:11 +04:00
Roman Donchenko
2d9b3a8334
Deleted a bunch of unused configuration macros.
2013-07-10 18:29:10 +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
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Roman Donchenko
a0f6e1ba1d
Merge pull request #1103 from apavlenko:ver_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