MYLS
3935855365
Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests
...
# Conflicts:
# modules/core/test/test_io.cpp
2016-07-30 01:08:27 +08:00
MYLS
08911cbfae
change code
to snippet
and do some cleaning.
...
- use `@snippet` instead of `@code` in docs.
- remove some functions that were not used.
2016-07-30 00:35:41 +08:00
Alexander Alekhin
f2e9588c93
Merge pull request #6999 from tomoaki0705:featureCmakeFp16
2016-07-29 10:35:54 +00:00
Tomoaki Teshima
c57f8780e9
show CPU feature correctly when FP16 is available
...
* make sure that CV_FP16 has the correct meaning
* check FP16 feature correctly
2016-07-29 14:10:33 +09:00
Vadim Pisarevsky
3b1803f6b1
Merge pull request #6989 from mself:gftt-deterministic-sort
2016-07-28 15:27:39 +00:00
Vadim Pisarevsky
f96b5652ce
Merge pull request #6984 from K-Shinotsuka:issue9
2016-07-28 12:05:13 +00:00
Vadim Pisarevsky
b721269c29
Merge pull request #6996 from juliendehos:merge_debevec
2016-07-28 11:51:12 +00:00
Alexander Alekhin
8cdd91cd23
Merge pull request #7006 from derlunz:fix-qtopengl-build
2016-07-27 20:10:38 +00:00
Christian Kapeller
81e6ef2958
highgui: window QT+OpenGL mouse wheel support, another build fix
...
amends work done in pull request #6976 .
2016-07-27 16:14:57 +02:00
k-shinotsuka
ecfd4ad11e
improve MomentsInTile_SIMD<ushort, int, int>()
2016-07-27 20:27:30 +09:00
StevenPuttemans
64dbf6c987
fix build #6993
2016-07-27 11:21:08 +02:00
Alexander Alekhin
9ad0dcb57f
Merge pull request #6987 from tomoaki0705:fixTypoCalib3d
2016-07-26 20:15:45 +00:00
Julien Dehos
e072fa8121
fix a bug in MergeDebevec (modify input times)
2016-07-26 18:01:36 +02:00
Matthew Self
72672c293f
Make goodFeaturesToTrack() return deterministic results
...
When using OCL, the results of goodFeaturesToTrack() vary slightly from
run to run. This appears to be because the order of the results from
the findCorners kernel depends on thread execution and the sorting
function that is used at the end to rank the features only enforces are
partial sort order.
This does not materially impact the quality of the results, but it
makes it hard to build regression tests and generally introduces noise
into the system that should be avoided.
An easy fix is to change the sort function to enforce a total sort on
the features, even in cases where the match quality is exactly the same
for two features.
2016-07-25 21:17:54 -07:00
Tomoaki Teshima
ce66de8e3d
calib3d: fix typo
2016-07-26 12:56:10 +09: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
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
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
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
MYLS
8a65e73bfd
add SANITY_CHECK_NOTHING() to perf_test
2016-07-20 20:18:16 +08: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
Vadim Pisarevsky
b34272f8a2
Merge pull request #6787 from theg4sh:linux-window-mouse-wheel-support
2016-07-19 19:06:03 +00:00
Alexander Alekhin
6d65f7a261
Merge pull request #6954 from ilya-lavrenov:typo
2016-07-19 16:25:26 +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