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

8 years agoFixes header filtering for python bindings generator
Maksim Shabunin [Wed, 13 Jul 2016 16:49:38 +0000 (19:49 +0300)]
Fixes header filtering for python bindings generator

8 years agoMerge pull request #6824 from dozyc:tapi_hog_sample
Alexander Alekhin [Wed, 13 Jul 2016 15:18:14 +0000 (15:18 +0000)]
Merge pull request #6824 from dozyc:tapi_hog_sample

8 years agoMerge pull request #6794 from jet47:cuda-modules-fixes
Alexander Alekhin [Wed, 13 Jul 2016 15:13:55 +0000 (15:13 +0000)]
Merge pull request #6794 from jet47:cuda-modules-fixes

8 years agoRestored check chessboard parameters
Maksim Shabunin [Wed, 13 Jul 2016 13:03:47 +0000 (16:03 +0300)]
Restored check chessboard parameters

8 years agoPorted PR #4187 to master
Maksim Shabunin [Wed, 13 Jul 2016 12:46:48 +0000 (15:46 +0300)]
Ported PR #4187 to master

8 years agoCleanup
Maksim Shabunin [Wed, 13 Jul 2016 12:45:48 +0000 (15:45 +0300)]
Cleanup

8 years agoMerge pull request #6896 from jet47:cuda-arch-update
Alexander Alekhin [Wed, 13 Jul 2016 12:26:52 +0000 (12:26 +0000)]
Merge pull request #6896 from jet47:cuda-arch-update

8 years agoMerge pull request #6808 from sturkmen72:patch-14
Alexander Alekhin [Wed, 13 Jul 2016 11:54:11 +0000 (11:54 +0000)]
Merge pull request #6808 from sturkmen72:patch-14

8 years agoMerge pull request #6880 from berak:fix_opencv_visualization
Alexander Alekhin [Wed, 13 Jul 2016 11:51:29 +0000 (11:51 +0000)]
Merge pull request #6880 from berak:fix_opencv_visualization

8 years agoMerge pull request #6892 from ioxp:fsSpace
Alexander Alekhin [Wed, 13 Jul 2016 11:46:50 +0000 (11:46 +0000)]
Merge pull request #6892 from ioxp:fsSpace

8 years agoMerge pull request #6814 from tomoaki0705:featureThreshold64fSimd
Alexander Alekhin [Wed, 13 Jul 2016 11:45:27 +0000 (11:45 +0000)]
Merge pull request #6814 from tomoaki0705:featureThreshold64fSimd

8 years agoupdate CUDA architecture flags initialization
Vladislav Vinogradov [Wed, 13 Jul 2016 10:03:16 +0000 (13:03 +0300)]
update CUDA architecture flags initialization

* remove obsolete paths
* add Pascal arch support

8 years agoincrease minimal supported CUDA toolkit to 6.5
Vladislav Vinogradov [Wed, 13 Jul 2016 10:02:13 +0000 (13:02 +0300)]
increase minimal supported CUDA toolkit to 6.5

8 years agofixup! Fixed several merge issues
Maksim Shabunin [Wed, 13 Jul 2016 09:11:44 +0000 (12:11 +0300)]
fixup! Fixed several merge issues

8 years agoFixed several merge issues
Maksim Shabunin [Wed, 13 Jul 2016 08:45:32 +0000 (11:45 +0300)]
Fixed several merge issues

8 years agocheck the CPU flag correctly
Tomoaki Teshima [Tue, 12 Jul 2016 22:10:20 +0000 (07:10 +0900)]
check the CPU flag correctly

8 years agoCreation of Maven POM project and documentation.
Kerry Billingham [Sat, 26 Mar 2016 23:30:35 +0000 (23:30 +0000)]
Creation of Maven POM project and documentation.

This commit introduces a POM.xml file to allow the build of OpenCV and Java bundles using Maven.

An additonal directory has been created  'platforms/maven' to contain the POM and scripts used during the build process. An additional Markdown file is included to give instructions on how to build with Maven.

8 years agoopencv_visualization: check cmdline args
berak [Tue, 12 Jul 2016 05:38:52 +0000 (07:38 +0200)]
opencv_visualization: check cmdline args

8 years agoMerge pull request #6889 from ilya-lavrenov:exif
Alexander Alekhin [Tue, 12 Jul 2016 15:12:19 +0000 (15:12 +0000)]
Merge pull request #6889 from ilya-lavrenov:exif

8 years agoprovide better error messages
Sergei Nosov [Tue, 12 Jul 2016 15:03:28 +0000 (18:03 +0300)]
provide better error messages

8 years agoMerge pull request #6883 from ilya-lavrenov:resize
Alexander Alekhin [Tue, 12 Jul 2016 14:35:25 +0000 (14:35 +0000)]
Merge pull request #6883 from ilya-lavrenov:resize

8 years agoMerge pull request #6887 from sovrasov:calib_dist_coeffs_check
Alexander Alekhin [Tue, 12 Jul 2016 14:34:19 +0000 (14:34 +0000)]
Merge pull request #6887 from sovrasov:calib_dist_coeffs_check

8 years agoMerge pull request #6886 from ilya-lavrenov:cuda_docs
Alexander Alekhin [Tue, 12 Jul 2016 13:53:08 +0000 (13:53 +0000)]
Merge pull request #6886 from ilya-lavrenov:cuda_docs

8 years agostop search of markers in Exif reader to prevent infinite loop
Ilya Lavrenov [Tue, 12 Jul 2016 13:01:12 +0000 (16:01 +0300)]
stop search of markers in Exif reader to prevent infinite loop

8 years agoModified and improved the method for chessboard detection. It is now faster and detec...
Oliver Schreer [Fri, 22 May 2015 08:39:01 +0000 (10:39 +0200)]
Modified and improved the method for chessboard detection. It is now faster and detects chessboards under difficult lighting condition as well as when the chessboard has strong out of plane rotations

8 years agoFix calibration fail on python with CALIB_THIN_PRISM_MODEL flag
Vladislav Sovrasov [Tue, 12 Jul 2016 10:34:34 +0000 (13:34 +0300)]
Fix calibration fail on python with CALIB_THIN_PRISM_MODEL flag

8 years agoMerge pull request #6882 from ilya-lavrenov:flann
Alexander Alekhin [Tue, 12 Jul 2016 10:49:17 +0000 (10:49 +0000)]
Merge pull request #6882 from ilya-lavrenov:flann

8 years agoclarify CUDA arithm operations usage with mask
Ilya Lavrenov [Tue, 12 Jul 2016 10:32:58 +0000 (13:32 +0300)]
clarify CUDA arithm operations usage with mask

8 years agoffmpeg: try to load ffmpeg wrapper dll from the current module directory
Alexander Alekhin [Fri, 8 Jul 2016 12:47:50 +0000 (15:47 +0300)]
ffmpeg: try to load ffmpeg wrapper dll from the current module directory

8 years agofixed empty image condition in resize
Ilya Lavrenov [Tue, 12 Jul 2016 09:39:49 +0000 (12:39 +0300)]
fixed empty image condition in resize

8 years agomigration: github.com/opencv/opencv
Alexander Alekhin [Tue, 14 Jun 2016 13:01:36 +0000 (16:01 +0300)]
migration: github.com/opencv/opencv