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
Vadim Pisarevsky
8124b5600f
Merge pull request #7007 from tomoaki0705:fixDocTypo
2016-07-28 11:42:07 +00:00
Vadim Pisarevsky
f9e02aa612
Merge pull request #6986 from Wing0:master
2016-07-28 11:35:07 +00:00
Tomoaki Teshima
bae8b2a9b0
doc: fix typo and grammar
2016-07-28 18:35:16 +09:00
Alexander Alekhin
8cdd91cd23
Merge pull request #7006 from derlunz:fix-qtopengl-build
2016-07-27 20:10:38 +00:00
Alexander Alekhin
6cff909bc8
Merge pull request #7004 from StevenPuttemans:cmd_parser_opencv_annotation
2016-07-27 18:24:17 +00:00
Alexander Alekhin
328da251ed
Merge pull request #7000 from StevenPuttemans:fix_master_build
2016-07-27 18:17:37 +00:00
Alexander Alekhin
085ea5049b
Merge pull request #7002 from StevenPuttemans:add_extra_limits_to_help
2016-07-27 18:16:37 +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
StevenPuttemans
e0f19ec48a
change parameter input to the CommandLineParser interface
2016-07-27 14:02:28 +02:00
k-shinotsuka
ecfd4ad11e
improve MomentsInTile_SIMD<ushort, int, int>()
2016-07-27 20:27:30 +09:00
StevenPuttemans
6df12a0507
add limits of tool to help message
2016-07-27 11:42:22 +02:00
StevenPuttemans
64dbf6c987
fix build #6993
2016-07-27 11:21:08 +02:00
Your Name
718891d937
Tabs -> Whitespaces.
2016-07-26 23:46:58 -03:00
Your Name
c6f790ce12
Fixed using local variable instead of global var.
...
- Still need to change SSE_2
2016-07-26 23:29:05 -03: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
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
Прун Виктор
fa42a1cfc2
fix calib3d changes in #6836 plus some others
2016-07-22 19:02:53 +03: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
Sergei Nosov
b3d55489d3
fix compiler warning
2016-07-21 10:57:58 +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