Alexander Alekhin [Wed, 27 Jul 2016 18:17:37 +0000 (18:17 +0000)]
Merge pull request #7000 from StevenPuttemans:fix_master_build
Alexander Alekhin [Wed, 27 Jul 2016 18:16:36 +0000 (18:16 +0000)]
Merge pull request #7002 from StevenPuttemans:add_extra_limits_to_help
StevenPuttemans [Wed, 27 Jul 2016 09:39:50 +0000 (11:39 +0200)]
add limits of tool to help message
StevenPuttemans [Wed, 27 Jul 2016 09:21:08 +0000 (11:21 +0200)]
fix build #6993
Alexander Alekhin [Tue, 26 Jul 2016 20:15:45 +0000 (20:15 +0000)]
Merge pull request #6987 from tomoaki0705:fixTypoCalib3d
Tomoaki Teshima [Tue, 26 Jul 2016 03:56:10 +0000 (12:56 +0900)]
calib3d: fix typo
Alexander Alekhin [Mon, 25 Jul 2016 11:39:10 +0000 (11:39 +0000)]
Merge pull request #6982 from tfauck:master
Thierry Fauck [Mon, 25 Jul 2016 09:30:50 +0000 (11:30 +0200)]
Non existent definition of _FPU_EXTENDED definition prevent compilation when WITH_CUDA set
Non existence of _FPU_EXTENDED definition on powerpc64 (like it is for apple and arm)
prevent compilation when WITH_CUDA is set. Adding powerpc64 as case to not use these
definitions
modifié: modules/cudalegacy/test/TestHaarCascadeApplication.cpp
modifié: modules/cudalegacy/test/test_precomp.hpp
Signed-off-by: Thierry Fauck <tfauck@free.fr>
Alexander Alekhin [Mon, 25 Jul 2016 08:09:18 +0000 (08:09 +0000)]
Merge pull request #6980 from tomoaki0705:fixNanUndeclared2
Tomoaki Teshima [Sun, 24 Jul 2016 23:27:52 +0000 (08:27 +0900)]
fix build error
* NAN is not defined on some platform
* follow the comment on PR
Alexander Alekhin [Sun, 24 Jul 2016 16:53:01 +0000 (16:53 +0000)]
Merge pull request #6975 from tomoaki0705:fixNanUndeclared
Tomoaki Teshima [Sun, 24 Jul 2016 14:34:12 +0000 (23:34 +0900)]
follow the comment
* test build on VS2012
Alexander Alekhin [Sun, 24 Jul 2016 10:11:39 +0000 (10:11 +0000)]
Merge pull request #6976 from theg4sh:linux-window-mouse-wheel-support
Alexandr Kondratev [Sat, 23 Jul 2016 15:06:46 +0000 (18:06 +0300)]
highgui: window QT+OpenGL mouse wheel support, build fix
Tomoaki Teshima [Sat, 23 Jul 2016 14:11:57 +0000 (23:11 +0900)]
fix build error
* NAN is not defined on some platform
Alexander Alekhin [Fri, 22 Jul 2016 13:19:35 +0000 (13:19 +0000)]
Merge pull request #6929 from catree:hitrate_doc
Alexander Alekhin [Fri, 22 Jul 2016 12:56:52 +0000 (12:56 +0000)]
Merge pull request #6968 from tomoaki0705:addDocsCudaRequirement
Tomoaki Teshima [Thu, 21 Jul 2016 22:04:37 +0000 (07:04 +0900)]
add note of minimum requirement of CUDA
Vadim Pisarevsky [Thu, 21 Jul 2016 21:22:02 +0000 (21:22 +0000)]
Merge pull request #6966 from theg4sh:linux-window-mouse-wheel-support
Vadim Pisarevsky [Thu, 21 Jul 2016 20:55:05 +0000 (20:55 +0000)]
Merge pull request #6963 from ilya-lavrenov:vec2i_fs
Alexandr Kondratev [Thu, 21 Jul 2016 15:16:41 +0000 (18:16 +0300)]
Merge branch 'master' of https://github.com/Itseez/opencv into linux-window-mouse-wheel-support
Alexandr Kondratev [Thu, 21 Jul 2016 15:13:42 +0000 (18:13 +0300)]
highgui: window_QT mouse wheel support
Alexandr Kondratev [Thu, 21 Jul 2016 14:51:19 +0000 (17:51 +0300)]
highgui: removed excessed variable orient in window_gtk
Ilya Lavrenov [Wed, 20 Jul 2016 09:25:30 +0000 (12:25 +0300)]
read/write vec2i from/to filestorage
Vadim Pisarevsky [Thu, 21 Jul 2016 07:40:35 +0000 (07:40 +0000)]
Merge pull request #6962 from alalek:fix_build_log_macro
Vadim Pisarevsky [Thu, 21 Jul 2016 07:31:11 +0000 (07:31 +0000)]
Merge pull request #6899 from alalek:ffmpeg_update
Vadim Pisarevsky [Thu, 21 Jul 2016 07:30:15 +0000 (07:30 +0000)]
Merge pull request #6942 from alalek:fix_android_pack
Vadim Pisarevsky [Thu, 21 Jul 2016 07:27:48 +0000 (07:27 +0000)]
Merge pull request #6964 from tomoaki0705:fixTypoImgproc
Tomoaki Teshima [Wed, 20 Jul 2016 21:42:11 +0000 (06:42 +0900)]
imgproc: fix typo
* indent line
Alexander Alekhin [Fri, 15 Jul 2016 14:00:02 +0000 (17:00 +0300)]
test: ffmpeg: change resolution for H264 test
Alexander Alekhin [Wed, 20 Jul 2016 15:32:22 +0000 (15:32 +0000)]
Merge pull request #6910 from ilya-lavrenov:clone
Alexander Alekhin [Wed, 20 Jul 2016 13:17:57 +0000 (16:17 +0300)]
fix build: move LOG macro from stitching public headers
Alexander Alekhin [Mon, 18 Jul 2016 14:45:16 +0000 (17:45 +0300)]
fix android pack build
Vadim Pisarevsky [Wed, 20 Jul 2016 13:42:30 +0000 (13:42 +0000)]
Merge pull request #6953 from ilya-lavrenov:arithm
Vadim Pisarevsky [Wed, 20 Jul 2016 13:19:06 +0000 (13:19 +0000)]
Merge pull request #6795 from tomoaki0705:accelerateBilateralFilterNeon
Vadim Pisarevsky [Wed, 20 Jul 2016 13:16:53 +0000 (13:16 +0000)]
Merge pull request #6878 from alalek:canny_custom_gradient
Vadim Pisarevsky [Wed, 20 Jul 2016 13:13:40 +0000 (13:13 +0000)]
Merge pull request #6879 from savuor:fix/RNG_corrupts_stack
Ilya Lavrenov [Tue, 19 Jul 2016 12:53:52 +0000 (15:53 +0300)]
fixed bug #5775
Tomoaki Teshima [Tue, 19 Jul 2016 23:28:49 +0000 (08:28 +0900)]
accelerate bilateralFilter using NEON
* clean up some lines
Vadim Pisarevsky [Tue, 19 Jul 2016 19:06:03 +0000 (19:06 +0000)]
Merge pull request #6787 from theg4sh:linux-window-mouse-wheel-support
Vadim Pisarevsky [Tue, 19 Jul 2016 17:21:09 +0000 (17:21 +0000)]
Merge pull request #6812 from aleksandaratanasov:master
Alexander Alekhin [Tue, 19 Jul 2016 16:25:26 +0000 (16:25 +0000)]
Merge pull request #6954 from ilya-lavrenov:typo
Vadim Pisarevsky [Tue, 19 Jul 2016 15:50:11 +0000 (15:50 +0000)]
Merge pull request #6816 from phunsukwangdu:devbranch1
Vadim Pisarevsky [Tue, 19 Jul 2016 15:37:31 +0000 (15:37 +0000)]
Merge pull request #6822 from saedrna:master
Rostislav Vasilikhin [Sat, 16 Jul 2016 14:55:54 +0000 (17:55 +0300)]
fixed memory corruption when normal dist. params have less channels than target matrix; test added
Alexander Alekhin [Mon, 11 Jul 2016 14:08:27 +0000 (17:08 +0300)]
imgproc test: Canny with custom gradient
Alexander Alekhin [Mon, 11 Jul 2016 13:34:21 +0000 (16:34 +0300)]
imgproc: Canny: enable IPP & OpenCL optimization code path
Alexander Alekhin [Mon, 11 Jul 2016 13:08:09 +0000 (16:08 +0300)]
imgproc: Canny with custom gradient
Alexander Alekhin [Tue, 19 Jul 2016 14:05:17 +0000 (14:05 +0000)]
Merge pull request #6951 from kurenai:fix_macro
Ilya Lavrenov [Tue, 19 Jul 2016 13:18:48 +0000 (16:18 +0300)]
fixed typo
Vadim Pisarevsky [Tue, 19 Jul 2016 12:11:23 +0000 (12:11 +0000)]
Merge pull request #6895 from mshabunin:check-6851
Alexander Alekhin [Tue, 19 Jul 2016 11:53:28 +0000 (11:53 +0000)]
Merge pull request #6950 from tomoaki0705:fixMf16cBuildError
kurenai [Tue, 19 Jul 2016 10:05:07 +0000 (18:05 +0800)]
Fix error when compiling with clang
Tomoaki Teshima [Tue, 19 Jul 2016 09:29:37 +0000 (18:29 +0900)]
let the test Video_AccSquared.accuracy pass on linux x64 debug
catree [Sun, 17 Jul 2016 05:53:12 +0000 (07:53 +0200)]
Add bib reference for overall hitrate and max false alarm rate formulas in train cascade tutorial.
Remove useless backslash.
Maksim Shabunin [Tue, 19 Jul 2016 08:47:57 +0000 (08:47 +0000)]
Merge pull request #6940 from andy-held:cuda_pyrlk_static_const_init
Ilya Lavrenov [Thu, 14 Jul 2016 13:36:57 +0000 (16:36 +0300)]
fixed clone of empty matrix
Vadim Pisarevsky [Mon, 18 Jul 2016 21:14:19 +0000 (21:14 +0000)]
Merge pull request #6773 from acinader:add-mask-to-match-template-demo
Vadim Pisarevsky [Mon, 18 Jul 2016 18:34:21 +0000 (18:34 +0000)]
Merge pull request #6797 from tomoaki0705:featureSIMDHog
Vadim Pisarevsky [Mon, 18 Jul 2016 18:24:34 +0000 (18:24 +0000)]
Merge pull request #6839 from thierrylamarre:better_png_transparency
Vadim Pisarevsky [Mon, 18 Jul 2016 18:16:02 +0000 (18:16 +0000)]
Merge pull request #6924 from K-Shinotsuka:issue3
Vadim Pisarevsky [Mon, 18 Jul 2016 16:00:43 +0000 (16:00 +0000)]
Merge pull request #6813 from mshabunin:gdcm-cmake-search
Vadim Pisarevsky [Mon, 18 Jul 2016 15:55:59 +0000 (15:55 +0000)]
Merge pull request #6830 from tomoaki0705:featureSupportFp16
Vadim Pisarevsky [Mon, 18 Jul 2016 15:53:35 +0000 (15:53 +0000)]
Merge pull request #6836 from vicproon:rectify_correct_principal_point
Vadim Pisarevsky [Mon, 18 Jul 2016 15:44:40 +0000 (15:44 +0000)]
Merge pull request #6860 from IshankGulati:svm-error-message
Vadim Pisarevsky [Mon, 18 Jul 2016 15:24:35 +0000 (15:24 +0000)]
Merge pull request #6831 from bobpaulin:master
Vadim Pisarevsky [Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)]
Merge pull request #6849 from alcinos:optflow_interface
Vadim Pisarevsky [Mon, 18 Jul 2016 14:43:23 +0000 (14:43 +0000)]
Merge pull request #6861 from teng88:patch-1
Alexander Alekhin [Mon, 18 Jul 2016 13:51:55 +0000 (13:51 +0000)]
Merge pull request #6928 from K-Shinotsuka:issue4
Alexander Alekhin [Mon, 18 Jul 2016 13:46:48 +0000 (13:46 +0000)]
Merge pull request #6915 from arrybn:bugs_4515_6544_tests
Alexander Alekhin [Mon, 18 Jul 2016 13:23:56 +0000 (13:23 +0000)]
Merge pull request #6932 from philippefoubert:bugfix_issue_6931
Andreas Franek [Mon, 18 Jul 2016 12:31:16 +0000 (14:31 +0200)]
replaced static const members with static functions for msvc
cpmpatability
Maksim Shabunin [Mon, 18 Jul 2016 08:56:26 +0000 (08:56 +0000)]
Merge pull request #6827 from jtkb:cmake-maven-release
Maksim Shabunin [Mon, 18 Jul 2016 08:38:49 +0000 (08:38 +0000)]
Merge pull request #6936 from catree:fix_NAryMatIterator_code_example
Maksim Shabunin [Mon, 18 Jul 2016 07:49:38 +0000 (07:49 +0000)]
Merge pull request #6884 from alalek:migration
Maksim Shabunin [Mon, 18 Jul 2016 07:33:12 +0000 (07:33 +0000)]
Merge pull request #6911 from ilya-lavrenov:push_back
arybnikov [Fri, 15 Jul 2016 09:15:31 +0000 (12:15 +0300)]
Added tests for issues ##4515, 6544
k-shinotsuka [Sun, 17 Jul 2016 05:32:52 +0000 (14:32 +0900)]
improve SymmRowSmallVec_8u32s().
catree [Sun, 17 Jul 2016 21:21:15 +0000 (23:21 +0200)]
Fix NAryMatIterator code example.
Philippe FOUBERT [Sun, 17 Jul 2016 10:22:37 +0000 (12:22 +0200)]
Resolves issue #6931
k-shinotsuka [Sat, 16 Jul 2016 13:01:28 +0000 (22:01 +0900)]
improve RowVec_8u32s().
Alexander Alekhin [Fri, 15 Jul 2016 16:52:42 +0000 (16:52 +0000)]
Merge pull request #6918 from jet47:gpu-opengl-sample-build
Maksim Shabunin [Fri, 15 Jul 2016 13:58:39 +0000 (13:58 +0000)]
Merge pull request #6803 from alalek:issue_6720
Arthur Cinader [Fri, 15 Jul 2016 13:57:12 +0000 (09:57 -0400)]
Fix explanation to refelect how matching currently works.
Alexander Alekhin [Fri, 15 Jul 2016 13:43:33 +0000 (13:43 +0000)]
Merge pull request #6916 from ilya-lavrenov:qt5
Alexander Alekhin [Wed, 13 Jul 2016 16:29:58 +0000 (19:29 +0300)]
ffmpeg windows wrapper 2.7.1=>3.1.1, openh264 1.4.0=>1.5.0, vpx 1.5.0
Alexander Alekhin [Fri, 15 Jul 2016 12:58:19 +0000 (12:58 +0000)]
Merge pull request #6905 from alalek:ffmpeg_fix_get_fps
Maksim Shabunin [Fri, 15 Jul 2016 12:31:18 +0000 (12:31 +0000)]
Merge pull request #6798 from tomoaki0705:featureSSEvideoAcc
Maksim Shabunin [Fri, 15 Jul 2016 12:28:29 +0000 (12:28 +0000)]
Merge pull request #6779 from alalek:python_dynamic_lookup
Vladislav Vinogradov [Fri, 15 Jul 2016 12:14:56 +0000 (15:14 +0300)]
use HAVE_OPENGL instead of WITH_OPENGL for GPU opengl sample
in this case the sample will not be built if OpenGL is not found
Ilya Lavrenov [Thu, 14 Jul 2016 14:13:09 +0000 (17:13 +0300)]
added some tests for push_back
Ilya Lavrenov [Fri, 15 Jul 2016 11:01:22 +0000 (14:01 +0300)]
added condition for Qt5
Maksim Shabunin [Fri, 15 Jul 2016 09:08:21 +0000 (09:08 +0000)]
Merge pull request #6909 from jet47:fix-gpu-examples-compilation
Maksim Shabunin [Fri, 15 Jul 2016 09:07:56 +0000 (09:07 +0000)]
Merge pull request #6908 from ilya-lavrenov:reduce
Maksim Shabunin [Fri, 15 Jul 2016 09:07:19 +0000 (09:07 +0000)]
Merge pull request #6907 from ilya-lavrenov:typo
Maksim Shabunin [Fri, 15 Jul 2016 09:06:55 +0000 (09:06 +0000)]
Merge pull request #6906 from jet47:goodFeaturesToTrack-maxCorners-docs
Maksim Shabunin [Fri, 15 Jul 2016 09:06:15 +0000 (09:06 +0000)]
Merge pull request #6904 from ilya-lavrenov:minmaxloc
Tomoaki Teshima [Thu, 14 Jul 2016 23:04:18 +0000 (08:04 +0900)]
speed up accumulate, accumulateSquare, accumulateProduct and accumulateWeighted using SIMD
* use SSE and/or AVX based on configuration
* revise the test to verify the implementation
Alexander Alekhin [Thu, 14 Jul 2016 16:17:03 +0000 (16:17 +0000)]
Merge pull request #6762 from maff91:master
Maksim Shabunin [Thu, 14 Jul 2016 14:36:45 +0000 (14:36 +0000)]
Merge pull request #6815 from smigielski:fix_6605