platform/upstream/opencv.git
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 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 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 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

8 years agoMerge pull request #6839 from thierrylamarre:better_png_transparency
Vadim Pisarevsky [Mon, 18 Jul 2016 18:24:34 +0000 (18:24 +0000)]
Merge pull request #6839 from thierrylamarre:better_png_transparency

8 years agoMerge pull request #6924 from K-Shinotsuka:issue3
Vadim Pisarevsky [Mon, 18 Jul 2016 18:16:02 +0000 (18:16 +0000)]
Merge pull request #6924 from K-Shinotsuka:issue3

8 years agoMerge pull request #6813 from mshabunin:gdcm-cmake-search
Vadim Pisarevsky [Mon, 18 Jul 2016 16:00:43 +0000 (16:00 +0000)]
Merge pull request #6813 from mshabunin:gdcm-cmake-search

8 years agoMerge pull request #6830 from tomoaki0705:featureSupportFp16
Vadim Pisarevsky [Mon, 18 Jul 2016 15:55:59 +0000 (15:55 +0000)]
Merge pull request #6830 from tomoaki0705:featureSupportFp16

8 years agoMerge pull request #6836 from vicproon:rectify_correct_principal_point
Vadim Pisarevsky [Mon, 18 Jul 2016 15:53:35 +0000 (15:53 +0000)]
Merge pull request #6836 from vicproon:rectify_correct_principal_point

8 years agoMerge pull request #6860 from IshankGulati:svm-error-message
Vadim Pisarevsky [Mon, 18 Jul 2016 15:44:40 +0000 (15:44 +0000)]
Merge pull request #6860 from IshankGulati:svm-error-message

8 years agoMerge pull request #6831 from bobpaulin:master
Vadim Pisarevsky [Mon, 18 Jul 2016 15:24:35 +0000 (15:24 +0000)]
Merge pull request #6831 from bobpaulin:master

8 years agoMerge pull request #6849 from alcinos:optflow_interface
Vadim Pisarevsky [Mon, 18 Jul 2016 15:05:13 +0000 (15:05 +0000)]
Merge pull request #6849 from alcinos:optflow_interface

8 years agoMerge pull request #6861 from teng88:patch-1
Vadim Pisarevsky [Mon, 18 Jul 2016 14:43:23 +0000 (14:43 +0000)]
Merge pull request #6861 from teng88:patch-1

8 years agoMerge pull request #6928 from K-Shinotsuka:issue4
Alexander Alekhin [Mon, 18 Jul 2016 13:51:55 +0000 (13:51 +0000)]
Merge pull request #6928 from K-Shinotsuka:issue4

8 years agoMerge pull request #6915 from arrybn:bugs_4515_6544_tests
Alexander Alekhin [Mon, 18 Jul 2016 13:46:48 +0000 (13:46 +0000)]
Merge pull request #6915 from arrybn:bugs_4515_6544_tests

8 years agoMerge pull request #6932 from philippefoubert:bugfix_issue_6931
Alexander Alekhin [Mon, 18 Jul 2016 13:23:56 +0000 (13:23 +0000)]
Merge pull request #6932 from philippefoubert:bugfix_issue_6931

8 years agoreplaced static const members with static functions for msvc
Andreas Franek [Mon, 18 Jul 2016 12:31:16 +0000 (14:31 +0200)]
replaced static const members with static functions for msvc
cpmpatability

8 years agoMerge pull request #6827 from jtkb:cmake-maven-release
Maksim Shabunin [Mon, 18 Jul 2016 08:56:26 +0000 (08:56 +0000)]
Merge pull request #6827 from jtkb:cmake-maven-release

8 years agoMerge pull request #6936 from catree:fix_NAryMatIterator_code_example
Maksim Shabunin [Mon, 18 Jul 2016 08:38:49 +0000 (08:38 +0000)]
Merge pull request #6936 from catree:fix_NAryMatIterator_code_example

8 years agoMerge pull request #6884 from alalek:migration
Maksim Shabunin [Mon, 18 Jul 2016 07:49:38 +0000 (07:49 +0000)]
Merge pull request #6884 from alalek:migration

8 years agoMerge pull request #6911 from ilya-lavrenov:push_back
Maksim Shabunin [Mon, 18 Jul 2016 07:33:12 +0000 (07:33 +0000)]
Merge pull request #6911 from ilya-lavrenov:push_back

8 years agoAdded tests for issues ##4515, 6544
arybnikov [Fri, 15 Jul 2016 09:15:31 +0000 (12:15 +0300)]
Added tests for issues ##4515, 6544

8 years agoimprove SymmRowSmallVec_8u32s().
k-shinotsuka [Sun, 17 Jul 2016 05:32:52 +0000 (14:32 +0900)]
improve SymmRowSmallVec_8u32s().

8 years agoFix NAryMatIterator code example.
catree [Sun, 17 Jul 2016 21:21:15 +0000 (23:21 +0200)]
Fix NAryMatIterator code example.

8 years agoResolves issue #6931
Philippe FOUBERT [Sun, 17 Jul 2016 10:22:37 +0000 (12:22 +0200)]
Resolves issue #6931

8 years agoimprove RowVec_8u32s().
k-shinotsuka [Sat, 16 Jul 2016 13:01:28 +0000 (22:01 +0900)]
improve RowVec_8u32s().

8 years agoMerge pull request #6918 from jet47:gpu-opengl-sample-build
Alexander Alekhin [Fri, 15 Jul 2016 16:52:42 +0000 (16:52 +0000)]
Merge pull request #6918 from jet47:gpu-opengl-sample-build

8 years agoMerge pull request #6803 from alalek:issue_6720
Maksim Shabunin [Fri, 15 Jul 2016 13:58:39 +0000 (13:58 +0000)]
Merge pull request #6803 from alalek:issue_6720

8 years agoFix explanation to refelect how matching currently works.
Arthur Cinader [Fri, 15 Jul 2016 13:57:12 +0000 (09:57 -0400)]
Fix explanation to refelect how matching currently works.

8 years agoMerge pull request #6916 from ilya-lavrenov:qt5
Alexander Alekhin [Fri, 15 Jul 2016 13:43:33 +0000 (13:43 +0000)]
Merge pull request #6916 from ilya-lavrenov:qt5

8 years agoffmpeg windows wrapper 2.7.1=>3.1.1, openh264 1.4.0=>1.5.0, vpx 1.5.0
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

8 years agoMerge pull request #6905 from alalek:ffmpeg_fix_get_fps
Alexander Alekhin [Fri, 15 Jul 2016 12:58:19 +0000 (12:58 +0000)]
Merge pull request #6905 from alalek:ffmpeg_fix_get_fps

8 years agoMerge pull request #6798 from tomoaki0705:featureSSEvideoAcc
Maksim Shabunin [Fri, 15 Jul 2016 12:31:18 +0000 (12:31 +0000)]
Merge pull request #6798 from tomoaki0705:featureSSEvideoAcc

8 years agoMerge pull request #6779 from alalek:python_dynamic_lookup
Maksim Shabunin [Fri, 15 Jul 2016 12:28:29 +0000 (12:28 +0000)]
Merge pull request #6779 from alalek:python_dynamic_lookup

8 years agouse HAVE_OPENGL instead of WITH_OPENGL for GPU opengl sample
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

8 years agoadded some tests for push_back
Ilya Lavrenov [Thu, 14 Jul 2016 14:13:09 +0000 (17:13 +0300)]
added some tests for push_back

8 years agoadded condition for Qt5
Ilya Lavrenov [Fri, 15 Jul 2016 11:01:22 +0000 (14:01 +0300)]
added condition for Qt5

8 years agoMerge pull request #6909 from jet47:fix-gpu-examples-compilation
Maksim Shabunin [Fri, 15 Jul 2016 09:08:21 +0000 (09:08 +0000)]
Merge pull request #6909 from jet47:fix-gpu-examples-compilation

8 years agoMerge pull request #6908 from ilya-lavrenov:reduce
Maksim Shabunin [Fri, 15 Jul 2016 09:07:56 +0000 (09:07 +0000)]
Merge pull request #6908 from ilya-lavrenov:reduce

8 years agoMerge pull request #6907 from ilya-lavrenov:typo
Maksim Shabunin [Fri, 15 Jul 2016 09:07:19 +0000 (09:07 +0000)]
Merge pull request #6907 from ilya-lavrenov:typo

8 years agoMerge pull request #6906 from jet47:goodFeaturesToTrack-maxCorners-docs
Maksim Shabunin [Fri, 15 Jul 2016 09:06:55 +0000 (09:06 +0000)]
Merge pull request #6906 from jet47:goodFeaturesToTrack-maxCorners-docs

8 years agoMerge pull request #6904 from ilya-lavrenov:minmaxloc
Maksim Shabunin [Fri, 15 Jul 2016 09:06:15 +0000 (09:06 +0000)]
Merge pull request #6904 from ilya-lavrenov:minmaxloc

8 years agospeed up accumulate, accumulateSquare, accumulateProduct and accumulateWeighted using...
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

8 years agoMerge pull request #6762 from maff91:master
Alexander Alekhin [Thu, 14 Jul 2016 16:17:03 +0000 (16:17 +0000)]
Merge pull request #6762 from maff91:master

8 years agoMerge pull request #6815 from smigielski:fix_6605
Maksim Shabunin [Thu, 14 Jul 2016 14:36:45 +0000 (14:36 +0000)]
Merge pull request #6815 from smigielski:fix_6605

8 years agoMerge pull request #6903 from jet47:cuda-stream-thread-safety-notes
Maksim Shabunin [Thu, 14 Jul 2016 14:29:08 +0000 (14:29 +0000)]
Merge pull request #6903 from jet47:cuda-stream-thread-safety-notes

8 years agoadded note about cv::reduce output type for MIN/MAX
Ilya Lavrenov [Thu, 14 Jul 2016 13:09:28 +0000 (16:09 +0300)]
added note about cv::reduce output type for MIN/MAX

8 years agofix video_reader GPU sample compilation after latest changes in master
Vladislav Vinogradov [Thu, 14 Jul 2016 13:18:43 +0000 (16:18 +0300)]
fix video_reader GPU sample compilation after latest changes in master

8 years agoremove 2-channel png encoder/decoder support
thierry [Thu, 14 Jul 2016 12:46:05 +0000 (14:46 +0200)]
remove 2-channel png encoder/decoder support

8 years agoremoved extra semicolon
Ilya Lavrenov [Thu, 14 Jul 2016 12:50:35 +0000 (15:50 +0300)]
removed extra semicolon

8 years agoadd note about "maxCorners <= 0" case in goodFeaturesToTrack
Vladislav Vinogradov [Thu, 14 Jul 2016 12:48:08 +0000 (15:48 +0300)]
add note about "maxCorners <= 0" case in goodFeaturesToTrack

8 years agoMerge pull request #6769 from andy-held:cuda_optflow_error_calc
Alexander Alekhin [Thu, 14 Jul 2016 12:24:24 +0000 (12:24 +0000)]
Merge pull request #6769 from andy-held:cuda_optflow_error_calc

8 years agoMerge pull request #6900 from mshabunin:fix-python-hal
Alexander Alekhin [Thu, 14 Jul 2016 12:23:05 +0000 (12:23 +0000)]
Merge pull request #6900 from mshabunin:fix-python-hal

8 years agoMerge branch 'master' into better_png_transparency
thierry [Thu, 14 Jul 2016 12:05:16 +0000 (14:05 +0200)]
Merge branch 'master' into better_png_transparency

* master: (468 commits)
  added suppression for TBB valgrind issue
  update CUDA architecture flags initialization
  increase minimal supported CUDA toolkit to 6.5
  check the CPU flag correctly
  opencv_visualization: check cmdline args
  provide better error messages
  stop search of markers in Exif reader to prevent infinite loop
  Fix calibration fail on python with CALIB_THIN_PRISM_MODEL flag
  clarify CUDA arithm operations usage with mask
  fixed empty image condition in resize
  fixed memory leak in flann tests
  fisheye: add CALIB_FIX_PRINCIPAL_POINT
  get/put: more type-safety and code unification using templates
  py_tutorials: fix cv2.findContours return val
  imgproc: speed up threshold of 64F version using NEON and SSE   * use NEON under aarch64 only   * check 64F version correctly
  bigdata: add test, resolve split/merge issue
  Improved Carotene library linear resize evaluation precision and enabled it as HAL implementation.
  persistence: fixing crash with space-only values
  Removed unnecessary check for Android API level and unused flags.
  Fix for median blur of 2-channel images
  ...

8 years agovideoio: ffmpeg: fix get_fps() implementation
Alexander Alekhin [Thu, 14 Jul 2016 11:50:04 +0000 (14:50 +0300)]
videoio: ffmpeg: fix get_fps() implementation

8 years agodisable ippiMinMaxIndx_32f_C1R usage since it crashes on Nans
Ilya Lavrenov [Thu, 14 Jul 2016 11:50:42 +0000 (14:50 +0300)]
disable ippiMinMaxIndx_32f_C1R usage since it crashes on Nans

8 years agoMerge pull request #6901 from ilya-lavrenov:valgrind-tbb-suppression
Maksim Shabunin [Thu, 14 Jul 2016 11:46:37 +0000 (11:46 +0000)]
Merge pull request #6901 from ilya-lavrenov:valgrind-tbb-suppression

8 years agoMerge pull request #6821 from sturkmen72:TickMeter_class_addition
Maksim Shabunin [Thu, 14 Jul 2016 11:40:46 +0000 (11:40 +0000)]
Merge pull request #6821 from sturkmen72:TickMeter_class_addition

8 years agoMerge pull request #6828 from paroj:cmatvals_cpp
Maksim Shabunin [Thu, 14 Jul 2016 11:31:48 +0000 (11:31 +0000)]
Merge pull request #6828 from paroj:cmatvals_cpp

8 years agoMerge pull request #6891 from snosov1:fix-5311
Maksim Shabunin [Thu, 14 Jul 2016 11:25:58 +0000 (11:25 +0000)]
Merge pull request #6891 from snosov1:fix-5311

8 years agoAdd note that cv::cuda::Stream class is not thread safe
Vladislav Vinogradov [Thu, 14 Jul 2016 11:20:37 +0000 (14:20 +0300)]
Add note that cv::cuda::Stream class is not thread safe

8 years agoMerge pull request #6809 from K-Shinotsuka:master
Maksim Shabunin [Thu, 14 Jul 2016 09:37:53 +0000 (09:37 +0000)]
Merge pull request #6809 from K-Shinotsuka:master

8 years agoMerge pull request #6863 from SorcererX:patch-1
Maksim Shabunin [Thu, 14 Jul 2016 09:34:12 +0000 (09:34 +0000)]
Merge pull request #6863 from SorcererX:patch-1

8 years agoadded suppression for TBB valgrind issue
Ilya Lavrenov [Thu, 14 Jul 2016 09:16:52 +0000 (12:16 +0300)]
added suppression for TBB valgrind issue