Oskari Vinko
31fb82176d
Corrected tutorial grammar and sentences
2016-07-25 20:25:38 +02:00
Alexander Alekhin
52444bf8d0
Merge pull request #6982 from tfauck:master
2016-07-25 11:39:10 +00:00
Thierry Fauck
0df9cbc954
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>
2016-07-25 11:30:50 +02:00
Alexander Alekhin
23fd32056e
Merge pull request #6980 from tomoaki0705:fixNanUndeclared2
2016-07-25 08:09:19 +00:00
Tomoaki Teshima
891c83ff35
fix build error
...
* NAN is not defined on some platform
* follow the comment on PR
2016-07-25 15:42:09 +09:00
Alexander Alekhin
1001b05def
Merge pull request #6975 from tomoaki0705:fixNanUndeclared
2016-07-24 16:53:01 +00:00
Tomoaki Teshima
70dcd107d0
follow the comment
...
* test build on VS2012
2016-07-24 23:34:12 +09:00
Alexander Alekhin
941090861e
Merge pull request #6976 from theg4sh:linux-window-mouse-wheel-support
2016-07-24 10:11:39 +00:00
Alexandr Kondratev
d394d26b46
highgui: window QT+OpenGL mouse wheel support, build fix
2016-07-23 18:06:46 +03:00
Tomoaki Teshima
4423a5edad
fix build error
...
* NAN is not defined on some platform
2016-07-23 23:11:57 +09:00
Alexander Alekhin
df9120768d
Merge pull request #6929 from catree:hitrate_doc
2016-07-22 13:19:35 +00:00
Alexander Alekhin
5f33d0c75b
Merge pull request #6968 from tomoaki0705:addDocsCudaRequirement
2016-07-22 12:56:52 +00:00
Tomoaki Teshima
531b8e2320
add note of minimum requirement of CUDA
2016-07-22 07:04:37 +09:00
Vadim Pisarevsky
80951bd091
Merge pull request #6966 from theg4sh:linux-window-mouse-wheel-support
2016-07-21 21:22:02 +00:00
Vadim Pisarevsky
134154ec6d
Merge pull request #6963 from ilya-lavrenov:vec2i_fs
2016-07-21 20:55:05 +00:00
Alexandr Kondratev
ecfabd7aac
Merge branch 'master' of https://github.com/Itseez/opencv into linux-window-mouse-wheel-support
2016-07-21 18:16:41 +03:00
Alexandr Kondratev
13aef2c0cf
highgui: window_QT mouse wheel support
2016-07-21 18:13:42 +03:00
Alexandr Kondratev
82e4e1816f
highgui: removed excessed variable orient in window_gtk
2016-07-21 17:51:19 +03:00
Ilya Lavrenov
313f54bc39
read/write vec2i from/to filestorage
2016-07-21 10:58:49 +03:00
Vadim Pisarevsky
371096493c
Merge pull request #6962 from alalek:fix_build_log_macro
2016-07-21 07:40:35 +00:00
Vadim Pisarevsky
6b09ada5d4
Merge pull request #6899 from alalek:ffmpeg_update
2016-07-21 07:31:11 +00:00
Vadim Pisarevsky
167a4e6592
Merge pull request #6942 from alalek:fix_android_pack
2016-07-21 07:30:15 +00:00
Vadim Pisarevsky
1fc655a58f
Merge pull request #6964 from tomoaki0705:fixTypoImgproc
2016-07-21 07:27:48 +00:00
Your Name
440ba2e4a7
Passing Disparity Shift as a parameter.
2016-07-20 22:57:55 -03:00
Tomoaki Teshima
57d1591957
imgproc: fix typo
...
* indent line
2016-07-21 06:42:11 +09:00
Alexander Alekhin
daf1879a2e
test: ffmpeg: change resolution for H264 test
2016-07-21 00:20:18 +03:00
Alexander Alekhin
2acfb263bb
Merge pull request #6910 from ilya-lavrenov:clone
2016-07-20 15:32:22 +00:00
Alexander Alekhin
60676dbbe8
fix build: move LOG macro from stitching public headers
2016-07-20 18:10:26 +03:00
Alexander Alekhin
2ec63e4dd1
fix android pack build
2016-07-20 16:49:57 +03:00
Vadim Pisarevsky
c4cc54e5da
Merge pull request #6953 from ilya-lavrenov:arithm
2016-07-20 13:42:30 +00:00
Vadim Pisarevsky
cc5c5f7da9
Merge pull request #6795 from tomoaki0705:accelerateBilateralFilterNeon
2016-07-20 13:19:06 +00:00
Vadim Pisarevsky
a455858dd9
Merge pull request #6878 from alalek:canny_custom_gradient
2016-07-20 13:16:53 +00:00
Vadim Pisarevsky
848c66babd
Merge pull request #6879 from savuor:fix/RNG_corrupts_stack
2016-07-20 13:13:40 +00:00
Ilya Lavrenov
71cbd6f02e
fixed bug #5775
2016-07-20 11:38:15 +03:00
Tomoaki Teshima
b436f4b995
accelerate bilateralFilter using NEON
...
* clean up some lines
2016-07-20 08:28:49 +09:00
Leonardo Brás
0e9c8e2dd5
'resolves' 6898
...
I have seen that you can input a Mat_<float> on StereoBM, but the value seems the same as CV_16S.
I changed it so, only if you input a Mat_<float> it makes use of a previously truncated 4 bits, giving more resolution to Disparity Matrix. (The algorithm stays the same, it's not more precise).
If any other input Mat is given, it changes nothing.
2016-07-19 20:11:41 -03:00
Vadim Pisarevsky
b34272f8a2
Merge pull request #6787 from theg4sh:linux-window-mouse-wheel-support
2016-07-19 19:06:03 +00:00
Vadim Pisarevsky
abbc988fb5
Merge pull request #6812 from aleksandaratanasov:master
2016-07-19 17:21:09 +00:00
Alexander Alekhin
6d65f7a261
Merge pull request #6954 from ilya-lavrenov:typo
2016-07-19 16:25:26 +00:00
Vadim Pisarevsky
705e776f09
Merge pull request #6816 from phunsukwangdu:devbranch1
2016-07-19 15:50:11 +00:00
Vadim Pisarevsky
b0cc495698
Merge pull request #6822 from saedrna:master
2016-07-19 15:37:31 +00:00
Rostislav Vasilikhin
96edb270a6
fixed memory corruption when normal dist. params have less channels than target matrix; test added
2016-07-19 17:26:39 +03:00
Alexander Alekhin
e20a93f7d6
imgproc test: Canny with custom gradient
2016-07-19 17:15:36 +03:00
Alexander Alekhin
575de89ee2
imgproc: Canny: enable IPP & OpenCL optimization code path
2016-07-19 17:15:36 +03:00
Alexander Alekhin
460b1dc2fa
imgproc: Canny with custom gradient
2016-07-19 17:15:36 +03:00
Alexander Alekhin
a2921fdede
Merge pull request #6951 from kurenai:fix_macro
2016-07-19 14:05:17 +00:00
Ilya Lavrenov
6c42ad5b90
fixed typo
2016-07-19 16:18:48 +03:00
Vadim Pisarevsky
5d3860703d
Merge pull request #6895 from mshabunin:check-6851
2016-07-19 12:11:23 +00:00
Alexander Alekhin
22919c39ad
Merge pull request #6950 from tomoaki0705:fixMf16cBuildError
2016-07-19 11:53:28 +00:00
kurenai
2dec662ebf
Fix error when compiling with clang
2016-07-19 18:05:07 +08:00
