Commit Graph

19804 Commits

Author SHA1 Message Date
k-shinotsuka 0fc187d7a3 improve HLS2RGB_b() 2016-09-18 15:46:00 +09:00
Vadim Pisarevsky dc3d0cbc22 Merge pull request #7266 from alalek:pr7159 2016-09-16 21:18:26 +00:00
Alexander Alekhin d5c202e46b Merge pull request #7294 from tomoaki0705:fixBuildCudaAarch64 2016-09-16 14:27:18 +00:00
Alexander Alekhin fb912e1ba7 Merge pull request #7295 from lupustr3:pvlasov/vs11_compat_fix 2016-09-16 13:20:08 +00:00
Alexander Alekhin 26ecf2f374 Merge pull request #7285 from danil-tolkachev:none-comparison 2016-09-16 09:57:59 +00:00
Alexander Alekhin a35bec1e0a Merge pull request #7293 from Algomorph:master 2016-09-16 09:57:34 +00:00
Pavel Vlasov 0a9470bf09 Compatibility fix for Visual Studio 2012; 2016-09-16 10:03:42 +03:00
Gregory Kramida 0d626c8fef v4l2 backend: Y16 default behavior fixed & FOURCC setting added
1) Cameras started with Y16 (V4L2_PIX_FMT_Y16) format via v4l2 backend will now exhibit default camera behavior, i.e. convert the 16-bit image to BGR as with all other formats. 16-bit 1-channel output will now only be produced for Y16 if CV_CAP_PROP_CONVERT_RGB is set to "false" using VideoCap::set method.
2) v4l2 videoio backend now supports setting CV_CAP_PROP_FOURCC explicitly (icvSetPropertyCAM_V4L function in cap_v4l.cpp), allowing users to manually set the codec on cameras that support multiple codecs.
2016-09-15 21:02:24 -04:00
Tomoaki Teshima 0db4b7cebb fix build error on CUDA + Aarch64
* __fp16 doesn't exist on nvcc, but it slips through ifdef guard
2016-09-16 08:06:14 +09:00
Alexander Alekhin aac745c8e4 Merge pull request #7291 from lr-morales:openni/7290-openni1_2_conflict 2016-09-15 17:10:20 +00:00
Luis Roberto Morales Iglesias 60b33046a7 [Issue #7290] Fixes OpenNI and OpenNI2 linking conflict 2016-09-15 17:13:04 +02:00
stbnps a4a6ee34bf Added support for V4L2_PIX_FMT_Y16 2016-09-15 11:06:15 -04:00
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
danil-tolkachev 50d02b9f84 supress numpy future warning with None comparison 2016-09-14 21:39:11 +03: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
Alexander Alekhin f85e33f4af videoio: refactor AVFoundation code integration 2016-09-09 17:42:41 +03: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