Alexander Alekhin
32df09c275
Merge pull request #7287 from seanm:master
2016-09-15 10:39:49 +00:00
Sean McBride
5357e28a2f
Removed some extra semi-colons
...
Fixes clang -Wextra-semi warnings.
2016-09-14 16:22:35 -04:00
Alexander Alekhin
05b15943d6
Merge pull request #7188 from valeriyvan:andfutheriosfixes
2016-09-14 17:05:34 +00:00
Alexander Alekhin
d1492eefca
Merge pull request #7181 from valeriyvan:ioscleanup
2016-09-14 17:04:59 +00:00
Vadim Pisarevsky
ab3814f9b9
Merge pull request #7191 from anirudt:docs_moments
2016-09-14 12:30:27 +00:00
Vadim Pisarevsky
6a1e549ffe
Merge pull request #7217 from thiell:master
2016-09-14 12:08:45 +00:00
Vadim Pisarevsky
0d3b6465bd
Merge pull request #7112 from StevenPuttemans:improve_cascadeclassifier_training_tutorial
2016-09-14 12:07:26 +00:00
Vadim Pisarevsky
52535d3ef1
Merge pull request #7278 from alalek:opencv_version
2016-09-14 11:56:11 +00:00
Vadim Pisarevsky
a554941737
Merge pull request #7280 from sovrasov:calib_app_license
2016-09-14 11:54:55 +00:00
Alexander Alekhin
adbf2dc9f1
Merge pull request #7193 from valeriyvan:osxcleanup
2016-09-14 11:51:25 +00:00
Valeriy Van
f1dcf71dd7
Merge pull request #7178 from valeriyvan:iosfixes
...
* Changes delegate property from assign to weak
In modern Objective-C delegate should be weak. In very rare conditions you might want delegate be strong.
Assign for delegate is sign of legacy code.
This change prevents crash when you forget nil delegate in dealloc and makes rush with nilling delegate unnecessary.
This change shouldn't break any existing code.
* Adds implementation for setters and getters for weak delegate properties for non ARC Obj-C files
For whatever reason compiler can't synthesize these.
And yes, it's time to convert all Objective-C stuff to ARC.
2016-09-14 14:48:41 +03:00
Vladislav Sovrasov
ec40b85e75
Add license to interactive-calibration app sources
2016-09-14 12:52:06 +03:00
Alexander Alekhin
2935fcea62
apps: add opencv_version command line tool
2016-09-14 09:28:10 +03:00
anirudt
2879eada25
docs: truncated commit msg
2016-09-13 16:14:05 +05:30
Vadim Pisarevsky
473dba1189
Merge pull request #7208 from terfendail:openvx_hal_impl
2016-09-13 10:15:12 +00:00
Vadim Pisarevsky
ca9183d567
Merge pull request #7034 from K-Shinotsuka:issue12
2016-09-13 10:05:46 +00:00
StevenPuttemans
a65f2b4bd3
huge overhaul/update of cascade classifier training
2016-09-12 09:56:09 +02:00
Vadim Pisarevsky
b632f95f8d
Merge pull request #7133 from sovrasov:interactive_calibration_update
2016-09-09 19:33:46 +00:00
Vadim Pisarevsky
a9ab869800
seriously improved performance of blur function, especially 3x3 and 5x5 cases ( #7262 )
...
* seriously improved performance of blur function, especially 3x3 and 5x5 cases
* trying to fix warnings and test failures
* replaced #if 0 with #if IPP_DISABLE_BLOCK
2016-09-09 23:31:02 +04:00
Maksim Shabunin
4e918fb987
Merge pull request #7165 from PkLab:doc_videoio
2016-09-09 18:01:41 +00:00
PkLab.net
be65701908
Large update of videoio doc and samples following mshabunin comments
2016-09-09 18:46:11 +02:00
Vadim Pisarevsky
c1024b112e
Merge pull request #7259 from alalek:issue_7232
2016-09-09 12:08:40 +00:00
Vadim Pisarevsky
6dd609a709
Merge pull request #7260 from alalek:ffmpeg_windows_binaries
2016-09-09 12:07:12 +00:00
anirudt
06e0fb25e9
docs: adds doxygen @note for python in docs related to contour moments
2016-09-09 13:23:43 +05:30
Vitaly Tuzov
311a232a09
Added color conversion HAL API functions implemented as immediate mode OpenVX calls.
2016-09-08 20:40:51 +03:00
Alexander Alekhin
186f6977bc
ffmpeg: update Windows binaries (ffmpeg 3.1.3)
2016-09-08 19:54:02 +03:00
Vitaly Tuzov
14fd22e664
Added morphology and channel merge HAL API functions implemented as immediate mode OpenVX calls.
2016-09-08 19:47:03 +03:00
Alexander Alekhin
d402bac69d
cmake: fix libpng build on MSVS2012
2016-09-08 19:41:11 +03:00
Alexander Alekhin
ca4b7e1e0f
Merge pull request #7171 from alalek:ocl_instrumentation
2016-09-08 16:31:22 +00:00
Vitaly Tuzov
fb3140ceef
Fixed compilation. Changed value returned by functions called with unsuported parameters.
2016-09-08 18:55:27 +03:00
Vitaly Tuzov
5ec47299e2
Fixed warpings, added border mode support to warps and filter. Added morphology HAL API functions implemented as immediate mode OpenVX calls.
2016-09-08 18:55:26 +03:00
Vitaly Tuzov
c9229f7543
Resize, Warp and Filter HAL API functions are implemented as immediate mode OpenVX calls
2016-09-08 18:55:25 +03:00
Vitaly Tuzov
4170c97984
Several HAL API functions are implemented as immediate mode OpenVX calls
2016-09-08 18:55:25 +03:00
Maksim Shabunin
11a65475d8
Merge pull request #7257 from alalek:issue_7256
2016-09-08 15:28:09 +00:00
Alexander Alekhin
e5e30253ef
Merge pull request #7213 from alalek:issue_7203
2016-09-08 15:25:14 +00:00
Alexander Alekhin
c7f5bc3624
viz: use ../precomp.hpp in modules/viz/src/vtk/* files
2016-09-08 16:19:44 +03:00
Alexander Alekhin
d855608e6e
instrumentation: fix build on Linux
...
- enable C++11
- fix macro
2016-09-08 16:13:46 +03:00
Alexander Alekhin
10d18a315c
instrumentation: minor refactoring, wrap OpenCL
...
- calculate ticksTotal instead of ticksMean
- local / global width is based on ticksTotal value
- added instrumentation for OpenCL program compilation
- added instrumentation for OpenCL kernel execution
2016-09-08 16:13:44 +03:00
Alexander Alekhin
03767340bb
ffmpeg: fill avg_frame_rate
2016-09-08 15:43:34 +03:00
Alexander Alekhin
6d54abbd0f
ffmpeg: fix get_fps()
2016-09-08 14:41:57 +03:00
Alexander Alekhin
4013ce570f
Merge pull request #7246 from paroj:bgfg_ocl
2016-09-08 11:16:01 +00:00
Alexander Alekhin
0bb85a0ec8
Merge pull request #7253 from Finfa811:revert_borderconstant
2016-09-08 11:15:25 +00:00
Vladislav Sovrasov
d5603caa0b
Delete direct lapack calls, minor fixes in UI
2016-09-08 13:00:36 +03:00
Alexander Alekhin
f6208e3dea
Merge pull request #7247 from valeriyvan:matrix
2016-09-08 09:49:02 +00:00
Alexander Alekhin
125e2dcbba
Merge pull request #7156 from sovrasov:hal_qr_decomp
2016-09-08 09:47:52 +00:00
Finfa811
fd1370b92b
Reverted BORDER_CONSTAT in stitcher.cpp
...
Resolves #7251
2016-09-08 10:49:48 +02:00
Alexander Alekhin
c8d77fd961
Merge pull request #7233 from tomoaki0705:featureUniversalIntrinsicFp16
2016-09-07 14:42:46 +00:00
Valeriy Van
c562f0ad38
Minor fix in MatAllocator::download
...
Minor fix in MatAllocator::upload
Minor fix in MatAllocator::copy
Minor fix in setSize function
Minor fix in Mat::Mat
Minor fix in cvMatNDToMat function
Minor fix in _InputArray::getMatVector
Minor fix in _InputArray::getUMatVector
Minor fix in cv::hconcat
Minor fix in cv::vconcat
Minor fix in cv::setIdentity
Minor fix in cv::trace
Minor fix in transposeI_ template function
Minor fix in reduceC_ template function
Minor fix in sort_ template function
Minor fix in sortIdx_ template function
Minor fix in cvRange function
Minor fix in MatConstIterator::seek
Minor fix in SparseMat::create
Minor fix in SparseMat::copyTo
Minor fix in SparseMat::convertTo
Minor fix in SparseMat::convertTo
Minor fix in SparseMat::ptr
Minor fix in SparseMat::resizeHashTab
Fixes indentation
2016-09-07 17:25:36 +03:00
Pavel Rojtberg
27ae1578ac
BackgroundSubtractorMOG2Impl: only use OpenCL if input image is UMat
2016-09-07 15:53:35 +02:00
Maksim Shabunin
48af5e5579
Merge pull request #7202 from valeriyvan:fixUIImageToMat
2016-09-06 20:45:19 +00:00
