platform/upstream/opencv.git
8 years agoMerge pull request #7038 from StevenPuttemans:fix_module_including
Maksim Shabunin [Thu, 4 Aug 2016 13:23:41 +0000 (13:23 +0000)]
Merge pull request #7038 from StevenPuttemans:fix_module_including

8 years agoMerge pull request #7039 from vpisarev:2_small_fixes
Vadim Pisarevsky [Thu, 4 Aug 2016 12:13:35 +0000 (12:13 +0000)]
Merge pull request #7039 from vpisarev:2_small_fixes

8 years ago1. fix warning from Xcode 7.x
Vadim Pisarevsky [Thu, 4 Aug 2016 09:52:10 +0000 (12:52 +0300)]
1. fix warning from Xcode 7.x
2. fixed parsing of "cat[range_spec]ord[range_spec]" type specification string when using ml::TrainData::loadFromCSV(). Thanks to A. Kaehler for reporting it

8 years agofix including of correct header files #7027
StevenPuttemans [Thu, 4 Aug 2016 09:32:33 +0000 (11:32 +0200)]
fix including of correct header files #7027

8 years agoMerge pull request #7033 from tomoaki0705:brushUpFp16
Alexander Alekhin [Thu, 4 Aug 2016 09:31:52 +0000 (09:31 +0000)]
Merge pull request #7033 from tomoaki0705:brushUpFp16

8 years agoMerge pull request #7026 from sovrasov:calib_points_number
Vadim Pisarevsky [Thu, 4 Aug 2016 09:14:03 +0000 (09:14 +0000)]
Merge pull request #7026 from sovrasov:calib_points_number

8 years agoMerge pull request #6970 from K-Shinotsuka:issue6
Vadim Pisarevsky [Wed, 3 Aug 2016 18:50:00 +0000 (18:50 +0000)]
Merge pull request #6970 from K-Shinotsuka:issue6

8 years agoMerge pull request #7010 from K-Shinotsuka:issue10
Vadim Pisarevsky [Wed, 3 Aug 2016 18:44:02 +0000 (18:44 +0000)]
Merge pull request #7010 from K-Shinotsuka:issue10

8 years agoMerge pull request #7011 from K-Shinotsuka:issue11
Vadim Pisarevsky [Wed, 3 Aug 2016 18:34:07 +0000 (18:34 +0000)]
Merge pull request #7011 from K-Shinotsuka:issue11

8 years agoMerge pull request #7030 from jpaveggio:patch-1
Alexander Alekhin [Wed, 3 Aug 2016 10:20:23 +0000 (10:20 +0000)]
Merge pull request #7030 from jpaveggio:patch-1

8 years agoimprove SumSqr_SIMD<schar, int, int>()
k-shinotsuka [Fri, 29 Jul 2016 14:18:02 +0000 (23:18 +0900)]
improve SumSqr_SIMD<schar, int, int>()

8 years agobrush up convertFp16
Tomoaki Teshima [Wed, 3 Aug 2016 07:53:52 +0000 (16:53 +0900)]
brush up convertFp16
  * raise an error when wrong bit depth passed
  * raise an build error when wrong depth is specified for cvtScaleHalf_
  * remove unnecessary safe check in cvtScaleHalf_
  * use intrinsic instead of direct pointer access
  * update the explanation

8 years agoUpdate bagofwords.cpp
Juan Pablo Aveggio [Tue, 2 Aug 2016 23:53:05 +0000 (20:53 -0300)]
Update bagofwords.cpp

8 years agoimprove SumSqr_SIMD<uchar, int, int>()
k-shinotsuka [Fri, 29 Jul 2016 11:10:14 +0000 (20:10 +0900)]
improve SumSqr_SIMD<uchar, int, int>()

8 years agoimprove thresh_8u()
k-shinotsuka [Fri, 22 Jul 2016 14:03:57 +0000 (23:03 +0900)]
improve thresh_8u()

8 years agoMerge pull request #6959 from LeoBras:Better_StereoBM
Vadim Pisarevsky [Tue, 2 Aug 2016 14:30:02 +0000 (14:30 +0000)]
Merge pull request #6959 from LeoBras:Better_StereoBM

8 years agoDon't assume all images have the same number of calibration points
Jeff McBride [Tue, 12 Apr 2016 01:43:41 +0000 (01:43 +0000)]
Don't assume all images have the same number of calibration points

Cast to (int) to avoid warnings

Add test for different points number case in fisheye calibration function

8 years agoMerge pull request #6991 from tomoaki0705:featureGpuMatFp16
Alexander Alekhin [Tue, 2 Aug 2016 08:39:24 +0000 (08:39 +0000)]
Merge pull request #6991 from tomoaki0705:featureGpuMatFp16

8 years agoMerge pull request #7018 from catree:add_camera_model_doc
Alexander Alekhin [Mon, 1 Aug 2016 13:27:33 +0000 (13:27 +0000)]
Merge pull request #7018 from catree:add_camera_model_doc

8 years agoAdd pinhole camera model illustration in calib3d documentation.
catree [Mon, 1 Aug 2016 00:25:45 +0000 (02:25 +0200)]
Add pinhole camera model illustration in calib3d documentation.

8 years agocudev: add feature to convert FP32(float) from/to FP16(half) on GPU
Tomoaki Teshima [Mon, 25 Jul 2016 23:58:34 +0000 (08:58 +0900)]
cudev: add feature to convert FP32(float) from/to FP16(half) on GPU
  * add feature of Fp16 on GPU (cudev)
  * add test
  * leave template function as unimplemented to raise error

8 years agoMerge pull request #6999 from tomoaki0705:featureCmakeFp16
Alexander Alekhin [Fri, 29 Jul 2016 10:35:54 +0000 (10:35 +0000)]
Merge pull request #6999 from tomoaki0705:featureCmakeFp16

8 years agoshow CPU feature correctly when FP16 is available
Tomoaki Teshima [Thu, 28 Jul 2016 22:00:10 +0000 (07:00 +0900)]
show CPU feature correctly when FP16 is available
  * make sure that CV_FP16 has the correct meaning
  * check FP16 feature correctly

8 years agoMerge pull request #6989 from mself:gftt-deterministic-sort
Vadim Pisarevsky [Thu, 28 Jul 2016 15:27:39 +0000 (15:27 +0000)]
Merge pull request #6989 from mself:gftt-deterministic-sort

8 years agoMerge pull request #6984 from K-Shinotsuka:issue9
Vadim Pisarevsky [Thu, 28 Jul 2016 12:05:13 +0000 (12:05 +0000)]
Merge pull request #6984 from K-Shinotsuka:issue9

8 years agoMerge pull request #6996 from juliendehos:merge_debevec
Vadim Pisarevsky [Thu, 28 Jul 2016 11:51:12 +0000 (11:51 +0000)]
Merge pull request #6996 from juliendehos:merge_debevec

8 years agoMerge pull request #7007 from tomoaki0705:fixDocTypo
Vadim Pisarevsky [Thu, 28 Jul 2016 11:42:07 +0000 (11:42 +0000)]
Merge pull request #7007 from tomoaki0705:fixDocTypo

8 years agoMerge pull request #6986 from Wing0:master
Vadim Pisarevsky [Thu, 28 Jul 2016 11:35:06 +0000 (11:35 +0000)]
Merge pull request #6986 from Wing0:master

8 years agodoc: fix typo and grammar
Tomoaki Teshima [Thu, 28 Jul 2016 09:35:16 +0000 (18:35 +0900)]
doc: fix typo and grammar

8 years agoMerge pull request #7006 from derlunz:fix-qtopengl-build
Alexander Alekhin [Wed, 27 Jul 2016 20:10:37 +0000 (20:10 +0000)]
Merge pull request #7006 from derlunz:fix-qtopengl-build

8 years agoMerge pull request #7004 from StevenPuttemans:cmd_parser_opencv_annotation
Alexander Alekhin [Wed, 27 Jul 2016 18:24:17 +0000 (18:24 +0000)]
Merge pull request #7004 from StevenPuttemans:cmd_parser_opencv_annotation

8 years agoMerge pull request #7000 from StevenPuttemans:fix_master_build
Alexander Alekhin [Wed, 27 Jul 2016 18:17:37 +0000 (18:17 +0000)]
Merge pull request #7000 from StevenPuttemans:fix_master_build

8 years agoMerge pull request #7002 from StevenPuttemans:add_extra_limits_to_help
Alexander Alekhin [Wed, 27 Jul 2016 18:16:36 +0000 (18:16 +0000)]
Merge pull request #7002 from StevenPuttemans:add_extra_limits_to_help

8 years agohighgui: window QT+OpenGL mouse wheel support, another build fix
Christian Kapeller [Wed, 27 Jul 2016 14:14:57 +0000 (16:14 +0200)]
highgui: window QT+OpenGL mouse wheel support, another build fix

amends work done in pull request #6976.

8 years agochange parameter input to the CommandLineParser interface
StevenPuttemans [Wed, 27 Jul 2016 12:02:28 +0000 (14:02 +0200)]
change parameter input to the CommandLineParser interface

8 years agoimprove MomentsInTile_SIMD<ushort, int, int>()
k-shinotsuka [Mon, 25 Jul 2016 13:12:25 +0000 (22:12 +0900)]
improve MomentsInTile_SIMD<ushort, int, int>()

8 years agoadd limits of tool to help message
StevenPuttemans [Wed, 27 Jul 2016 09:39:50 +0000 (11:39 +0200)]
add limits of tool to help message

8 years agofix build #6993
StevenPuttemans [Wed, 27 Jul 2016 09:21:08 +0000 (11:21 +0200)]
fix build #6993

8 years agoTabs -> Whitespaces.
Your Name [Wed, 27 Jul 2016 02:46:58 +0000 (23:46 -0300)]
Tabs -> Whitespaces.

8 years agoFixed using local variable instead of global var.
Your Name [Wed, 27 Jul 2016 02:29:05 +0000 (23:29 -0300)]
Fixed using local variable instead of global var.
- Still need to change SSE_2

8 years agoMerge pull request #6987 from tomoaki0705:fixTypoCalib3d
Alexander Alekhin [Tue, 26 Jul 2016 20:15:45 +0000 (20:15 +0000)]
Merge pull request #6987 from tomoaki0705:fixTypoCalib3d

8 years agofix a bug in MergeDebevec (modify input times)
Julien Dehos [Tue, 26 Jul 2016 16:01:36 +0000 (18:01 +0200)]
fix a bug in MergeDebevec (modify input times)

8 years agoMake goodFeaturesToTrack() return deterministic results
Matthew Self [Tue, 26 Jul 2016 04:17:54 +0000 (21:17 -0700)]
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.

8 years agocalib3d: fix typo
Tomoaki Teshima [Tue, 26 Jul 2016 03:56:10 +0000 (12:56 +0900)]
calib3d: fix typo

8 years agoCorrected tutorial grammar and sentences
Oskari Vinko [Mon, 25 Jul 2016 18:25:38 +0000 (20:25 +0200)]
Corrected tutorial grammar and sentences

8 years agoMerge pull request #6982 from tfauck:master
Alexander Alekhin [Mon, 25 Jul 2016 11:39:10 +0000 (11:39 +0000)]
Merge pull request #6982 from tfauck:master

8 years ago Non existent definition of _FPU_EXTENDED definition prevent compilation when...
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>
8 years agoMerge pull request #6980 from tomoaki0705:fixNanUndeclared2
Alexander Alekhin [Mon, 25 Jul 2016 08:09:18 +0000 (08:09 +0000)]
Merge pull request #6980 from tomoaki0705:fixNanUndeclared2

8 years agofix build error
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

8 years agoMerge pull request #6975 from tomoaki0705:fixNanUndeclared
Alexander Alekhin [Sun, 24 Jul 2016 16:53:01 +0000 (16:53 +0000)]
Merge pull request #6975 from tomoaki0705:fixNanUndeclared

8 years agofollow the comment
Tomoaki Teshima [Sun, 24 Jul 2016 14:34:12 +0000 (23:34 +0900)]
follow the comment
 * test build on VS2012

8 years agoMerge pull request #6976 from theg4sh:linux-window-mouse-wheel-support
Alexander Alekhin [Sun, 24 Jul 2016 10:11:39 +0000 (10:11 +0000)]
Merge pull request #6976 from theg4sh:linux-window-mouse-wheel-support

8 years agohighgui: window QT+OpenGL mouse wheel support, build fix
Alexandr Kondratev [Sat, 23 Jul 2016 15:06:46 +0000 (18:06 +0300)]
highgui: window QT+OpenGL mouse wheel support, build fix

8 years agofix build error
Tomoaki Teshima [Sat, 23 Jul 2016 14:11:57 +0000 (23:11 +0900)]
fix build error
  * NAN is not defined on some platform

8 years agoMerge pull request #6929 from catree:hitrate_doc
Alexander Alekhin [Fri, 22 Jul 2016 13:19:35 +0000 (13:19 +0000)]
Merge pull request #6929 from catree:hitrate_doc

8 years agoMerge pull request #6968 from tomoaki0705:addDocsCudaRequirement
Alexander Alekhin [Fri, 22 Jul 2016 12:56:52 +0000 (12:56 +0000)]
Merge pull request #6968 from tomoaki0705:addDocsCudaRequirement

8 years agoadd note of minimum requirement of CUDA
Tomoaki Teshima [Thu, 21 Jul 2016 22:04:37 +0000 (07:04 +0900)]
add note of minimum requirement of CUDA

8 years agoMerge pull request #6966 from theg4sh:linux-window-mouse-wheel-support
Vadim Pisarevsky [Thu, 21 Jul 2016 21:22:02 +0000 (21:22 +0000)]
Merge pull request #6966 from theg4sh:linux-window-mouse-wheel-support

8 years agoMerge pull request #6963 from ilya-lavrenov:vec2i_fs
Vadim Pisarevsky [Thu, 21 Jul 2016 20:55:05 +0000 (20:55 +0000)]
Merge pull request #6963 from ilya-lavrenov:vec2i_fs

8 years agoMerge branch 'master' of https://github.com/Itseez/opencv into linux-window-mouse...
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

8 years agohighgui: window_QT mouse wheel support
Alexandr Kondratev [Thu, 21 Jul 2016 15:13:42 +0000 (18:13 +0300)]
highgui: window_QT mouse wheel support

8 years agohighgui: removed excessed variable orient in window_gtk
Alexandr Kondratev [Thu, 21 Jul 2016 14:51:19 +0000 (17:51 +0300)]
highgui: removed excessed variable orient in window_gtk

8 years agoread/write vec2i from/to filestorage
Ilya Lavrenov [Wed, 20 Jul 2016 09:25:30 +0000 (12:25 +0300)]
read/write vec2i from/to filestorage

8 years agoMerge pull request #6962 from alalek:fix_build_log_macro
Vadim Pisarevsky [Thu, 21 Jul 2016 07:40:35 +0000 (07:40 +0000)]
Merge pull request #6962 from alalek:fix_build_log_macro

8 years agoMerge pull request #6899 from alalek:ffmpeg_update
Vadim Pisarevsky [Thu, 21 Jul 2016 07:31:11 +0000 (07:31 +0000)]
Merge pull request #6899 from alalek:ffmpeg_update

8 years agoMerge pull request #6942 from alalek:fix_android_pack
Vadim Pisarevsky [Thu, 21 Jul 2016 07:30:15 +0000 (07:30 +0000)]
Merge pull request #6942 from alalek:fix_android_pack

8 years agoMerge pull request #6964 from tomoaki0705:fixTypoImgproc
Vadim Pisarevsky [Thu, 21 Jul 2016 07:27:48 +0000 (07:27 +0000)]
Merge pull request #6964 from tomoaki0705:fixTypoImgproc

8 years agoPassing Disparity Shift as a parameter.
Your Name [Thu, 21 Jul 2016 01:57:55 +0000 (22:57 -0300)]
Passing Disparity Shift as a parameter.

8 years agoimgproc: fix typo
Tomoaki Teshima [Wed, 20 Jul 2016 21:42:11 +0000 (06:42 +0900)]
imgproc: fix typo
  * indent line

8 years agotest: ffmpeg: change resolution for H264 test
Alexander Alekhin [Fri, 15 Jul 2016 14:00:02 +0000 (17:00 +0300)]
test: ffmpeg: change resolution for H264 test

8 years agoMerge pull request #6910 from ilya-lavrenov:clone
Alexander Alekhin [Wed, 20 Jul 2016 15:32:22 +0000 (15:32 +0000)]
Merge pull request #6910 from ilya-lavrenov:clone

8 years agofix build: move LOG macro from stitching public headers
Alexander Alekhin [Wed, 20 Jul 2016 13:17:57 +0000 (16:17 +0300)]
fix build: move LOG macro from stitching public headers

8 years agofix android pack build
Alexander Alekhin [Mon, 18 Jul 2016 14:45:16 +0000 (17:45 +0300)]
fix android pack build

8 years agoMerge pull request #6953 from ilya-lavrenov:arithm
Vadim Pisarevsky [Wed, 20 Jul 2016 13:42:30 +0000 (13:42 +0000)]
Merge pull request #6953 from ilya-lavrenov:arithm

8 years agoMerge pull request #6795 from tomoaki0705:accelerateBilateralFilterNeon
Vadim Pisarevsky [Wed, 20 Jul 2016 13:19:06 +0000 (13:19 +0000)]
Merge pull request #6795 from tomoaki0705:accelerateBilateralFilterNeon

8 years agoMerge pull request #6878 from alalek:canny_custom_gradient
Vadim Pisarevsky [Wed, 20 Jul 2016 13:16:53 +0000 (13:16 +0000)]
Merge pull request #6878 from alalek:canny_custom_gradient

8 years agoMerge pull request #6879 from savuor:fix/RNG_corrupts_stack
Vadim Pisarevsky [Wed, 20 Jul 2016 13:13:40 +0000 (13:13 +0000)]
Merge pull request #6879 from savuor:fix/RNG_corrupts_stack

8 years agofixed bug #5775
Ilya Lavrenov [Tue, 19 Jul 2016 12:53:52 +0000 (15:53 +0300)]
fixed bug #5775

8 years agoaccelerate bilateralFilter using NEON
Tomoaki Teshima [Tue, 19 Jul 2016 23:28:49 +0000 (08:28 +0900)]
accelerate bilateralFilter using NEON
  * clean up some lines

8 years ago'resolves' 6898
Leonardo Brás [Fri, 15 Jul 2016 22:55:19 +0000 (19:55 -0300)]
'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.

8 years agoMerge pull request #6787 from theg4sh:linux-window-mouse-wheel-support
Vadim Pisarevsky [Tue, 19 Jul 2016 19:06:03 +0000 (19:06 +0000)]
Merge pull request #6787 from theg4sh:linux-window-mouse-wheel-support

8 years agoMerge pull request #6812 from aleksandaratanasov:master
Vadim Pisarevsky [Tue, 19 Jul 2016 17:21:09 +0000 (17:21 +0000)]
Merge pull request #6812 from aleksandaratanasov:master

8 years agoMerge pull request #6954 from ilya-lavrenov:typo
Alexander Alekhin [Tue, 19 Jul 2016 16:25:26 +0000 (16:25 +0000)]
Merge pull request #6954 from ilya-lavrenov:typo

8 years agoMerge pull request #6816 from phunsukwangdu:devbranch1
Vadim Pisarevsky [Tue, 19 Jul 2016 15:50:11 +0000 (15:50 +0000)]
Merge pull request #6816 from phunsukwangdu:devbranch1

8 years agoMerge pull request #6822 from saedrna:master
Vadim Pisarevsky [Tue, 19 Jul 2016 15:37:31 +0000 (15:37 +0000)]
Merge pull request #6822 from saedrna:master

8 years agofixed memory corruption when normal dist. params have less channels than target matri...
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

8 years agoimgproc test: Canny with custom gradient
Alexander Alekhin [Mon, 11 Jul 2016 14:08:27 +0000 (17:08 +0300)]
imgproc test: Canny with custom gradient

8 years agoimgproc: Canny: enable IPP & OpenCL optimization code path
Alexander Alekhin [Mon, 11 Jul 2016 13:34:21 +0000 (16:34 +0300)]
imgproc: Canny: enable IPP & OpenCL optimization code path

8 years agoimgproc: Canny with custom gradient
Alexander Alekhin [Mon, 11 Jul 2016 13:08:09 +0000 (16:08 +0300)]
imgproc: Canny with custom gradient

8 years agoMerge pull request #6951 from kurenai:fix_macro
Alexander Alekhin [Tue, 19 Jul 2016 14:05:17 +0000 (14:05 +0000)]
Merge pull request #6951 from kurenai:fix_macro

8 years agofixed typo
Ilya Lavrenov [Tue, 19 Jul 2016 13:18:48 +0000 (16:18 +0300)]
fixed typo

8 years agoMerge pull request #6895 from mshabunin:check-6851
Vadim Pisarevsky [Tue, 19 Jul 2016 12:11:23 +0000 (12:11 +0000)]
Merge pull request #6895 from mshabunin:check-6851

8 years agoMerge pull request #6950 from tomoaki0705:fixMf16cBuildError
Alexander Alekhin [Tue, 19 Jul 2016 11:53:28 +0000 (11:53 +0000)]
Merge pull request #6950 from tomoaki0705:fixMf16cBuildError

8 years agoFix error when compiling with clang
kurenai [Tue, 19 Jul 2016 10:05:07 +0000 (18:05 +0800)]
Fix error when compiling with clang

8 years agolet the test Video_AccSquared.accuracy pass on linux x64 debug
Tomoaki Teshima [Tue, 19 Jul 2016 09:29:37 +0000 (18:29 +0900)]
let the test Video_AccSquared.accuracy pass on linux x64 debug

8 years agoAdd bib reference for overall hitrate and max false alarm rate formulas in train...
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.

8 years agoMerge pull request #6940 from andy-held:cuda_pyrlk_static_const_init
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

8 years agofixed clone of empty matrix
Ilya Lavrenov [Thu, 14 Jul 2016 13:36:57 +0000 (16:36 +0300)]
fixed clone of empty matrix

8 years agoMerge pull request #6773 from acinader:add-mask-to-match-template-demo
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

8 years agoMerge pull request #6797 from tomoaki0705:featureSIMDHog
Vadim Pisarevsky [Mon, 18 Jul 2016 18:34:21 +0000 (18:34 +0000)]
Merge pull request #6797 from tomoaki0705:featureSIMDHog