Vadim Pisarevsky [Sat, 1 Oct 2016 15:48:21 +0000 (15:48 +0000)]
Merge pull request #7353 from alalek:ocl_update_canny_test_threshold
Vadim Pisarevsky [Sat, 1 Oct 2016 15:40:54 +0000 (15:40 +0000)]
Merge pull request #7368 from berak:py_tutorials_fix
Vadim Pisarevsky [Sat, 1 Oct 2016 15:38:59 +0000 (15:38 +0000)]
Merge pull request #7371 from mshabunin:aruco-java-wrap
Vadim Pisarevsky [Sat, 1 Oct 2016 15:37:33 +0000 (15:37 +0000)]
Merge pull request #7376 from alalek:fix_gcc_pch
Alexander Alekhin [Sat, 1 Oct 2016 10:44:55 +0000 (10:44 +0000)]
Merge pull request #7370 from souch55:Fixxn
Alexander Alekhin [Sat, 1 Oct 2016 10:34:58 +0000 (10:34 +0000)]
Merge pull request #7377 from alalek:fix_cuda_fp16
Alexander Alekhin [Fri, 30 Sep 2016 20:55:39 +0000 (23:55 +0300)]
cuda: fix fp16 compilation
Alexander Alekhin [Fri, 30 Sep 2016 20:37:43 +0000 (23:37 +0300)]
cmake: repair GCC PCH
mshabunin [Fri, 30 Sep 2016 13:21:04 +0000 (16:21 +0300)]
Fixed java wrappers
berak [Fri, 30 Sep 2016 07:57:44 +0000 (09:57 +0200)]
python tutorials: removed remainders of former Algorithm interface
sourin [Fri, 30 Sep 2016 09:46:29 +0000 (15:16 +0530)]
Fixed identifiers warns
Alexander Alekhin [Thu, 29 Sep 2016 16:37:45 +0000 (16:37 +0000)]
Merge pull request #7360 from alalek:fix_aarch64_fp16
Alexander Alekhin [Thu, 29 Sep 2016 11:00:27 +0000 (14:00 +0300)]
build: fix aarch64 build with aarch64-linux-gnu-g++-4.8
Maksim Shabunin [Thu, 29 Sep 2016 13:50:11 +0000 (13:50 +0000)]
Merge pull request #7361 from StevenPuttemans:fix_documentation_link_OPENNI
StevenPuttemans [Thu, 29 Sep 2016 12:59:43 +0000 (14:59 +0200)]
fix issue 7352
mshabunin [Thu, 29 Sep 2016 09:57:28 +0000 (12:57 +0300)]
Merge remote-tracking branch 'upstream/master' into pr7050
Alexander Alekhin [Wed, 28 Sep 2016 12:10:40 +0000 (12:10 +0000)]
Merge pull request #7347 from tomoaki0705:fixClang3rdparty
Alexander Alekhin [Wed, 28 Sep 2016 10:38:02 +0000 (13:38 +0300)]
ocl: update Canny test threshold
OpenCL Device:
- Intel(R) HD Graphics (OpenCL 2.0: r2.0.54425)
Alexander Alekhin [Wed, 28 Sep 2016 10:31:22 +0000 (10:31 +0000)]
Merge pull request #7342 from terfendail:OVXHAL_redundant_consts
Tomoaki Teshima [Tue, 27 Sep 2016 23:51:01 +0000 (08:51 +0900)]
let the build available using clang
* add if section for clang
Alexander Alekhin [Tue, 27 Sep 2016 13:33:42 +0000 (13:33 +0000)]
Merge pull request #6956 from mshabunin:fix-chessboard-bug
Alexander Alekhin [Tue, 27 Sep 2016 13:29:50 +0000 (13:29 +0000)]
Merge pull request #7334 from daB0bby:patch-3
Alexander Alekhin [Tue, 27 Sep 2016 13:29:32 +0000 (13:29 +0000)]
Merge pull request #7333 from daB0bby:patch-2
Vitaly Tuzov [Mon, 26 Sep 2016 14:13:18 +0000 (17:13 +0300)]
Remove redundant constant definitions
Alexander Alekhin [Mon, 26 Sep 2016 10:59:32 +0000 (10:59 +0000)]
Merge pull request #7317 from tomoaki0705:fixIfdefFp16
daB0bby [Fri, 23 Sep 2016 11:01:19 +0000 (13:01 +0200)]
bypass macro
daB0bby [Fri, 23 Sep 2016 11:00:30 +0000 (13:00 +0200)]
bypass macro
Tomoaki Teshima [Wed, 21 Sep 2016 06:42:54 +0000 (15:42 +0900)]
check FP16 build condition correctly
* use __GNUC_MINOR__ in correct place to check the version of GCC
* check processor support of FP16 at run time
* check compiler support of FP16 and pass correct compiler option
* rely on ENABLE_AVX on gcc since AVX is generated when mf16c is passed
* guard correctly using ifdef in case of various configuration
* use v_float16x4 correctly by including the right header file
Alexander Alekhin [Thu, 22 Sep 2016 16:43:28 +0000 (16:43 +0000)]
Merge pull request #7321 from sovrasov:python_test_update
Maksim Shabunin [Tue, 19 Jul 2016 14:24:55 +0000 (17:24 +0300)]
Several chessboard detector improvements:
- fixed uninitialized memory access and memory leaks
- extracted several code blocks to separate functions
- updated part of algorithm to use cv::Mat instead of CvMat and IplImage
Maksim Shabunin [Thu, 22 Sep 2016 15:55:19 +0000 (15:55 +0000)]
Merge pull request #7322 from alalek:fix_test_crash
Maksim Shabunin [Thu, 22 Sep 2016 15:52:06 +0000 (15:52 +0000)]
Merge pull request #7328 from alalek:fix_win32_2
Alexander Alekhin [Wed, 21 Sep 2016 14:50:42 +0000 (17:50 +0300)]
test: fix test crash (exception in destructor)
Vadim Pisarevsky [Thu, 22 Sep 2016 11:57:06 +0000 (11:57 +0000)]
Merge pull request #6845 from jbosch:master
Alexander Alekhin [Thu, 22 Sep 2016 11:51:53 +0000 (14:51 +0300)]
imgproc: fix win32 build
Vadim Pisarevsky [Thu, 22 Sep 2016 11:56:23 +0000 (11:56 +0000)]
Merge pull request #6820 from grochefort:fix_backgroundsubstractormog2_master
Alexander Alekhin [Thu, 22 Sep 2016 09:52:16 +0000 (09:52 +0000)]
Merge pull request #7323 from lupustr3:pvlasov/rgb_to_gray_array_fix
Alexander Alekhin [Wed, 21 Sep 2016 14:46:53 +0000 (14:46 +0000)]
Merge pull request #7309 from K-Shinotsuka:issue22
Pavel Vlasov [Wed, 21 Sep 2016 14:46:51 +0000 (17:46 +0300)]
RGB2Gray array size fix;
Vladislav Sovrasov [Wed, 21 Sep 2016 14:11:00 +0000 (17:11 +0300)]
Make test_texture_flow.py more robust
Alexander Alekhin [Wed, 21 Sep 2016 12:47:33 +0000 (12:47 +0000)]
Merge pull request #7306 from K-Shinotsuka:issue21
Alexander Alekhin [Wed, 21 Sep 2016 12:47:15 +0000 (12:47 +0000)]
Merge pull request #7305 from K-Shinotsuka:issue20
Alexander Alekhin [Wed, 21 Sep 2016 12:46:30 +0000 (12:46 +0000)]
Merge pull request #7304 from K-Shinotsuka:issue19
Alexander Alekhin [Wed, 21 Sep 2016 12:45:16 +0000 (12:45 +0000)]
Merge pull request #7303 from K-Shinotsuka:issue18
Alexander Alekhin [Wed, 21 Sep 2016 12:44:42 +0000 (12:44 +0000)]
Merge pull request #7300 from K-Shinotsuka:issue17
daB0bby [Wed, 21 Sep 2016 11:22:58 +0000 (13:22 +0200)]
Merge pull request #7320 from daB0bby:patch-1
* bypass makro
* syntax
Alexander Alekhin [Mon, 19 Sep 2016 12:24:50 +0000 (12:24 +0000)]
Merge pull request #7252 from terfendail:transparent_sobel_fix
Alexander Alekhin [Mon, 19 Sep 2016 12:23:06 +0000 (12:23 +0000)]
Merge pull request #7307 from Jeroonk:fix_detect_python_majorversion
k-shinotsuka [Sun, 18 Sep 2016 07:45:31 +0000 (16:45 +0900)]
improve RGB2HLS_b()
k-shinotsuka [Sun, 18 Sep 2016 14:07:09 +0000 (23:07 +0900)]
improve HSV2RGB_b()
Jeroen Kromwijk [Sun, 18 Sep 2016 10:02:33 +0000 (12:02 +0200)]
Detect the correct Python major version
k-shinotsuka [Sun, 18 Sep 2016 06:46:00 +0000 (15:46 +0900)]
improve HLS2RGB_b()
k-shinotsuka [Sun, 18 Sep 2016 05:48:40 +0000 (14:48 +0900)]
improve Lab2RGB_b()
k-shinotsuka [Sun, 18 Sep 2016 01:05:11 +0000 (10:05 +0900)]
improve RGB2Luv_b()
k-shinotsuka [Sat, 17 Sep 2016 07:32:34 +0000 (16:32 +0900)]
improve Luv2RGB_b()
Vadim Pisarevsky [Fri, 16 Sep 2016 21:18:26 +0000 (21:18 +0000)]
Merge pull request #7266 from alalek:pr7159
Alexander Alekhin [Fri, 16 Sep 2016 14:27:18 +0000 (14:27 +0000)]
Merge pull request #7294 from tomoaki0705:fixBuildCudaAarch64
Alexander Alekhin [Fri, 16 Sep 2016 13:20:08 +0000 (13:20 +0000)]
Merge pull request #7295 from lupustr3:pvlasov/vs11_compat_fix
Vitaly Tuzov [Wed, 7 Sep 2016 15:30:17 +0000 (18:30 +0300)]
Fix Sobel evaluation for image ROI without isolated border.
Alexander Alekhin [Fri, 16 Sep 2016 09:57:59 +0000 (09:57 +0000)]
Merge pull request #7285 from danil-tolkachev:none-comparison
Alexander Alekhin [Fri, 16 Sep 2016 09:57:34 +0000 (09:57 +0000)]
Merge pull request #7293 from Algomorph:master
Pavel Vlasov [Fri, 16 Sep 2016 07:03:42 +0000 (10:03 +0300)]
Compatibility fix for Visual Studio 2012;
Gregory Kramida [Thu, 15 Sep 2016 20:13:38 +0000 (16:13 -0400)]
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.
Tomoaki Teshima [Thu, 15 Sep 2016 23:06:14 +0000 (08:06 +0900)]
fix build error on CUDA + Aarch64
* __fp16 doesn't exist on nvcc, but it slips through ifdef guard
Alexander Alekhin [Thu, 15 Sep 2016 17:10:20 +0000 (17:10 +0000)]
Merge pull request #7291 from lr-morales:openni/7290-openni1_2_conflict
Luis Roberto Morales Iglesias [Thu, 15 Sep 2016 12:20:02 +0000 (14:20 +0200)]
[Issue #7290] Fixes OpenNI and OpenNI2 linking conflict
stbnps [Mon, 29 Aug 2016 20:49:02 +0000 (22:49 +0200)]
Added support for V4L2_PIX_FMT_Y16
Alexander Alekhin [Thu, 15 Sep 2016 10:39:48 +0000 (10:39 +0000)]
Merge pull request #7287 from seanm:master
Sean McBride [Wed, 14 Sep 2016 20:22:35 +0000 (16:22 -0400)]
Removed some extra semi-colons
Fixes clang -Wextra-semi warnings.
danil-tolkachev [Wed, 14 Sep 2016 18:39:11 +0000 (21:39 +0300)]
supress numpy future warning with `None` comparison
Alexander Alekhin [Wed, 14 Sep 2016 17:05:34 +0000 (17:05 +0000)]
Merge pull request #7188 from valeriyvan:andfutheriosfixes
Alexander Alekhin [Wed, 14 Sep 2016 17:04:59 +0000 (17:04 +0000)]
Merge pull request #7181 from valeriyvan:ioscleanup
Vadim Pisarevsky [Wed, 14 Sep 2016 12:30:27 +0000 (12:30 +0000)]
Merge pull request #7191 from anirudt:docs_moments
Vadim Pisarevsky [Wed, 14 Sep 2016 12:08:45 +0000 (12:08 +0000)]
Merge pull request #7217 from thiell:master
Vadim Pisarevsky [Wed, 14 Sep 2016 12:07:26 +0000 (12:07 +0000)]
Merge pull request #7112 from StevenPuttemans:improve_cascadeclassifier_training_tutorial
Vadim Pisarevsky [Wed, 14 Sep 2016 11:56:11 +0000 (11:56 +0000)]
Merge pull request #7278 from alalek:opencv_version
Vadim Pisarevsky [Wed, 14 Sep 2016 11:54:55 +0000 (11:54 +0000)]
Merge pull request #7280 from sovrasov:calib_app_license
Alexander Alekhin [Wed, 14 Sep 2016 11:51:25 +0000 (11:51 +0000)]
Merge pull request #7193 from valeriyvan:osxcleanup
Valeriy Van [Wed, 14 Sep 2016 11:48:41 +0000 (14:48 +0300)]
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.
Vladislav Sovrasov [Wed, 14 Sep 2016 09:16:10 +0000 (12:16 +0300)]
Add license to interactive-calibration app sources
Alexander Alekhin [Wed, 14 Sep 2016 06:22:54 +0000 (09:22 +0300)]
apps: add opencv_version command line tool
anirudt [Tue, 13 Sep 2016 10:44:05 +0000 (16:14 +0530)]
docs: truncated commit msg
Vadim Pisarevsky [Tue, 13 Sep 2016 10:15:12 +0000 (10:15 +0000)]
Merge pull request #7208 from terfendail:openvx_hal_impl
Vadim Pisarevsky [Tue, 13 Sep 2016 10:05:46 +0000 (10:05 +0000)]
Merge pull request #7034 from K-Shinotsuka:issue12
StevenPuttemans [Mon, 15 Aug 2016 14:18:31 +0000 (16:18 +0200)]
huge overhaul/update of cascade classifier training
Vadim Pisarevsky [Fri, 9 Sep 2016 19:33:46 +0000 (19:33 +0000)]
Merge pull request #7133 from sovrasov:interactive_calibration_update
Vadim Pisarevsky [Fri, 9 Sep 2016 19:31:02 +0000 (23:31 +0400)]
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
Maksim Shabunin [Fri, 9 Sep 2016 18:01:40 +0000 (18:01 +0000)]
Merge pull request #7165 from PkLab:doc_videoio
PkLab.net [Wed, 24 Aug 2016 17:57:17 +0000 (19:57 +0200)]
Large update of videoio doc and samples following mshabunin comments
Alexander Alekhin [Fri, 9 Sep 2016 12:38:00 +0000 (15:38 +0300)]
videoio: refactor AVFoundation code integration
Vadim Pisarevsky [Fri, 9 Sep 2016 12:08:40 +0000 (12:08 +0000)]
Merge pull request #7259 from alalek:issue_7232
Vadim Pisarevsky [Fri, 9 Sep 2016 12:07:12 +0000 (12:07 +0000)]
Merge pull request #7260 from alalek:ffmpeg_windows_binaries
anirudt [Fri, 9 Sep 2016 07:53:43 +0000 (13:23 +0530)]
docs: adds doxygen @note for python in docs related to contour moments
Vitaly Tuzov [Thu, 8 Sep 2016 17:40:51 +0000 (20:40 +0300)]
Added color conversion HAL API functions implemented as immediate mode OpenVX calls.
Alexander Alekhin [Thu, 8 Sep 2016 16:53:39 +0000 (19:53 +0300)]
ffmpeg: update Windows binaries (ffmpeg 3.1.3)
Vitaly Tuzov [Thu, 8 Sep 2016 16:47:03 +0000 (19:47 +0300)]
Added morphology and channel merge HAL API functions implemented as immediate mode OpenVX calls.
Alexander Alekhin [Thu, 8 Sep 2016 16:41:11 +0000 (19:41 +0300)]
cmake: fix libpng build on MSVS2012
Alexander Alekhin [Thu, 8 Sep 2016 16:31:22 +0000 (16:31 +0000)]
Merge pull request #7171 from alalek:ocl_instrumentation
Vitaly Tuzov [Thu, 8 Sep 2016 11:22:11 +0000 (14:22 +0300)]
Fixed compilation. Changed value returned by functions called with unsuported parameters.
Vitaly Tuzov [Thu, 1 Sep 2016 13:11:44 +0000 (16:11 +0300)]
Fixed warpings, added border mode support to warps and filter. Added morphology HAL API functions implemented as immediate mode OpenVX calls.