Alexander Alekhin
b43989bdaf
Merge pull request #7303 from K-Shinotsuka:issue18
2016-09-21 12:45:16 +00:00
Alexander Alekhin
17f0c93b37
Merge pull request #7300 from K-Shinotsuka:issue17
2016-09-21 12:44:42 +00:00
daB0bby
5728795cf7
Merge pull request #7320 from daB0bby:patch-1
...
* bypass makro
* syntax
2016-09-21 14:22:58 +03:00
Alexander Alekhin
c314178e7a
highgui/osx: backport AVFoundation support
2016-09-19 19:51:10 +03:00
Alexander Alekhin
3648c61172
highgui: clone cap_avfoundation_mac.mm from master
2016-09-19 19:46:42 +03:00
Francisco Facioni
31bd84de12
LSD: Removes unused code
2016-09-19 15:29:30 +01:00
Alexander Alekhin
cd6e7ac46e
Merge pull request #7252 from terfendail:transparent_sobel_fix
2016-09-19 12:24:50 +00:00
Alexander Alekhin
86f01c254d
Merge pull request #7307 from Jeroonk:fix_detect_python_majorversion
2016-09-19 12:23:06 +00:00
k-shinotsuka
0d85d2cc0a
improve RGB2HLS_b()
2016-09-18 23:36:31 +09:00
k-shinotsuka
4f22f48e63
improve HSV2RGB_b()
2016-09-18 23:07:09 +09:00
Jeroen Kromwijk
401537ebab
Detect the correct Python major version
2016-09-18 12:02:33 +02:00
k-shinotsuka
0fc187d7a3
improve HLS2RGB_b()
2016-09-18 15:46:00 +09:00
k-shinotsuka
1f8aa4f7d3
improve Lab2RGB_b()
2016-09-18 14:48:40 +09:00
k-shinotsuka
37be868679
improve RGB2Luv_b()
2016-09-18 11:08:57 +09:00
k-shinotsuka
4540260df9
improve Luv2RGB_b()
2016-09-17 19:42:48 +09:00
Vadim Pisarevsky
dc3d0cbc22
Merge pull request #7266 from alalek:pr7159
2016-09-16 21:18:26 +00:00
Alexander Alekhin
d68e350227
OpenCV version++
2016-09-16 18:55:58 +03:00
Alexander Alekhin
14ac55d05e
Merge pull request #7289 from alalek:android24
2016-09-16 15:55:39 +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
2d10336601
fix documentation
2016-09-16 16:15:51 +03:00
Alexander Alekhin
4d17051f14
android: backport Android SDK build script
2016-09-16 16:15:51 +03:00
Alexander Alekhin
9285dddbaa
android: clone build_sdk.py from 3.x
2016-09-16 16:15:51 +03:00
Vitaly Tuzov
48f132f35f
Fix Sobel evaluation for image ROI without isolated border.
2016-09-16 16:08:37 +03: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
Alexander Alekhin
1f6cf50be3
Merge pull request #7286 from alalek:fix_android_clang
2016-09-16 09:56: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
Alexander Alekhin
c68b9328ca
android: workaround for Android NDK-8e clang ICE
2016-09-14 23:20:10 +03: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
matze
975d2e4294
Enable built in counting trailing zeros function for Intel compiler and clang.
2016-09-14 18:20:47 +02: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
2f01930ecc
Merge pull request #7218 from savuor:fix2.4/copyTo
2016-09-14 11:58:29 +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