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
...
Maksim Shabunin [Thu, 14 Jul 2016 11:46:37 +0000 (11:46 +0000)]
Merge pull request #6901 from ilya-lavrenov:valgrind-tbb-suppression
Maksim Shabunin [Thu, 14 Jul 2016 11:40:46 +0000 (11:40 +0000)]
Merge pull request #6821 from sturkmen72:TickMeter_class_addition
Maksim Shabunin [Thu, 14 Jul 2016 11:31:48 +0000 (11:31 +0000)]
Merge pull request #6828 from paroj:cmatvals_cpp
Maksim Shabunin [Thu, 14 Jul 2016 11:25:58 +0000 (11:25 +0000)]
Merge pull request #6891 from snosov1:fix-5311
Maksim Shabunin [Thu, 14 Jul 2016 09:37:53 +0000 (09:37 +0000)]
Merge pull request #6809 from K-Shinotsuka:master
Maksim Shabunin [Thu, 14 Jul 2016 09:34:12 +0000 (09:34 +0000)]
Merge pull request #6863 from SorcererX:patch-1
Ilya Lavrenov [Thu, 14 Jul 2016 09:16:52 +0000 (12:16 +0300)]
added suppression for TBB valgrind issue
Alexander Alekhin [Wed, 13 Jul 2016 15:18:14 +0000 (15:18 +0000)]
Merge pull request #6824 from dozyc:tapi_hog_sample
Alexander Alekhin [Wed, 13 Jul 2016 15:13:55 +0000 (15:13 +0000)]
Merge pull request #6794 from jet47:cuda-modules-fixes
Alexander Alekhin [Wed, 13 Jul 2016 12:26:52 +0000 (12:26 +0000)]
Merge pull request #6896 from jet47:cuda-arch-update
Alexander Alekhin [Wed, 13 Jul 2016 11:54:11 +0000 (11:54 +0000)]
Merge pull request #6808 from sturkmen72:patch-14
Alexander Alekhin [Wed, 13 Jul 2016 11:51:29 +0000 (11:51 +0000)]
Merge pull request #6880 from berak:fix_opencv_visualization
Alexander Alekhin [Wed, 13 Jul 2016 11:46:50 +0000 (11:46 +0000)]
Merge pull request #6892 from ioxp:fsSpace
Alexander Alekhin [Wed, 13 Jul 2016 11:45:27 +0000 (11:45 +0000)]
Merge pull request #6814 from tomoaki0705:featureThreshold64fSimd
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
Vladislav Vinogradov [Wed, 13 Jul 2016 10:02:13 +0000 (13:02 +0300)]
increase minimal supported CUDA toolkit to 6.5
Tomoaki Teshima [Tue, 12 Jul 2016 22:10:20 +0000 (07:10 +0900)]
check the CPU flag correctly
berak [Tue, 12 Jul 2016 05:38:52 +0000 (07:38 +0200)]
opencv_visualization: check cmdline args
Alexander Alekhin [Tue, 12 Jul 2016 15:12:19 +0000 (15:12 +0000)]
Merge pull request #6889 from ilya-lavrenov:exif
Sergei Nosov [Tue, 12 Jul 2016 15:03:28 +0000 (18:03 +0300)]
provide better error messages
Alexander Alekhin [Tue, 12 Jul 2016 14:35:25 +0000 (14:35 +0000)]
Merge pull request #6883 from ilya-lavrenov:resize
Alexander Alekhin [Tue, 12 Jul 2016 14:34:19 +0000 (14:34 +0000)]
Merge pull request #6887 from sovrasov:calib_dist_coeffs_check
Alexander Alekhin [Tue, 12 Jul 2016 13:53:08 +0000 (13:53 +0000)]
Merge pull request #6886 from ilya-lavrenov:cuda_docs
Ilya Lavrenov [Tue, 12 Jul 2016 13:01:12 +0000 (16:01 +0300)]
stop search of markers in Exif reader to prevent infinite loop
Vladislav Sovrasov [Tue, 12 Jul 2016 10:34:34 +0000 (13:34 +0300)]
Fix calibration fail on python with CALIB_THIN_PRISM_MODEL flag
Alexander Alekhin [Tue, 12 Jul 2016 10:49:17 +0000 (10:49 +0000)]
Merge pull request #6882 from ilya-lavrenov:flann
Ilya Lavrenov [Tue, 12 Jul 2016 10:32:58 +0000 (13:32 +0300)]
clarify CUDA arithm operations usage with mask
Ilya Lavrenov [Tue, 12 Jul 2016 09:39:49 +0000 (12:39 +0300)]
fixed empty image condition in resize
Maksim Shabunin [Tue, 12 Jul 2016 09:35:22 +0000 (09:35 +0000)]
Merge pull request #6818 from Dikay900:template_patch
Ilya Lavrenov [Tue, 12 Jul 2016 08:53:51 +0000 (11:53 +0300)]
fixed memory leak in flann tests
Alexander Alekhin [Mon, 11 Jul 2016 16:34:36 +0000 (16:34 +0000)]
Merge pull request #6829 from paroj:fixpp_fe
Alexander Alekhin [Mon, 11 Jul 2016 16:32:23 +0000 (16:32 +0000)]
Merge pull request #6866 from alalek:gnu_toolchain
Pavel Rojtberg [Tue, 26 Apr 2016 10:15:53 +0000 (12:15 +0200)]
fisheye: add CALIB_FIX_PRINCIPAL_POINT
Alexander Alekhin [Mon, 11 Jul 2016 14:01:51 +0000 (14:01 +0000)]
Merge pull request #6846 from mbarnach:6086-cuda-initialization
Alexander Alekhin [Mon, 11 Jul 2016 14:01:06 +0000 (14:01 +0000)]
Merge pull request #6850 from alalek:bigdata_test
Alexander Alekhin [Mon, 11 Jul 2016 14:00:22 +0000 (14:00 +0000)]
Merge pull request #6867 from alalek:fix_lapack
Alexander Alekhin [Mon, 11 Jul 2016 13:06:00 +0000 (13:06 +0000)]
Merge pull request #6876 from janstarzy:jni-as-template-redone
Alexander Alekhin [Mon, 11 Jul 2016 10:51:26 +0000 (10:51 +0000)]
Merge pull request #6874 from berak:fix_py_tutorials
Alexander Alekhin [Mon, 11 Jul 2016 10:02:43 +0000 (10:02 +0000)]
Merge pull request #6786 from terfendail:median_fix
Alexander Alekhin [Mon, 11 Jul 2016 10:02:06 +0000 (10:02 +0000)]
Merge pull request #6790 from terfendail:linearresize_accuracy
Alexander Alekhin [Mon, 11 Jul 2016 09:57:49 +0000 (09:57 +0000)]
Merge pull request #6791 from terfendail:carotene4android_buildfix
Alexander Alekhin [Mon, 11 Jul 2016 09:57:19 +0000 (09:57 +0000)]
Merge pull request #6792 from paroj:jaccard_distance
Jan Starzynski [Mon, 11 Jul 2016 07:27:59 +0000 (09:27 +0200)]
get/put: more type-safety and code unification using templates
berak [Sun, 10 Jul 2016 09:17:00 +0000 (11:17 +0200)]
py_tutorials: fix cv2.findContours return val
Tomoaki Teshima [Tue, 21 Jun 2016 02:36:52 +0000 (11:36 +0900)]
imgproc: speed up threshold of 64F version using NEON and SSE
* use NEON under aarch64 only
* check 64F version correctly
Andrey Pavlenko [Fri, 8 Jul 2016 15:20:42 +0000 (15:20 +0000)]
Merge pull request #6771 from sovrasov:log_doc_fix
Andrey Pavlenko [Fri, 8 Jul 2016 15:18:22 +0000 (15:18 +0000)]
Merge pull request #6782 from LaurentBerger:I6780
Andrey Pavlenko [Fri, 8 Jul 2016 15:15:17 +0000 (15:15 +0000)]
Merge pull request #6775 from janstarzy:histo-ipp-fix
Alexander Alekhin [Fri, 8 Jul 2016 14:46:08 +0000 (17:46 +0300)]
bigdata: add test, resolve split/merge issue
Vitaly Tuzov [Fri, 8 Jul 2016 10:21:35 +0000 (13:21 +0300)]
Improved Carotene library linear resize evaluation precision and enabled it as HAL implementation.
Philipp Hasper [Thu, 7 Jul 2016 07:55:30 +0000 (09:55 +0200)]
persistence: fixing crash with space-only values
Vitaly Tuzov [Fri, 8 Jul 2016 10:31:26 +0000 (13:31 +0300)]
Removed unnecessary check for Android API level and unused flags.
Alexander Alekhin [Fri, 8 Jul 2016 09:49:08 +0000 (09:49 +0000)]
Merge pull request #6770 from ealbuz:master
Vitaly Tuzov [Thu, 7 Jul 2016 12:58:05 +0000 (15:58 +0300)]
Fix for median blur of 2-channel images
Alexander Alekhin [Thu, 7 Jul 2016 15:48:01 +0000 (15:48 +0000)]
Merge pull request #6785 from alalek:android_native_level
Alexander Alekhin [Thu, 7 Jul 2016 10:37:18 +0000 (13:37 +0300)]
android: increase default native API level 8=>9
LaurentBerger [Thu, 7 Jul 2016 07:29:41 +0000 (09:29 +0200)]
Issue 6780
Vladislav Vinogradov [Wed, 6 Jul 2016 11:27:08 +0000 (14:27 +0300)]
fix matrix type for keypoints buffer in CUDA FAST
use CV_32FC1 instead of CV_16SC2 since detectAsync uses CV_32FC1
to reallocate the matrix
Jan Starzynski [Wed, 6 Jul 2016 07:54:28 +0000 (09:54 +0200)]
fix for buffer-overflow in IPPCalcHistInvoker::operator()
Vladislav Sovrasov [Tue, 5 Jul 2016 14:28:53 +0000 (17:28 +0300)]
Update cv::log documentation
Elif Albuz [Tue, 5 Jul 2016 06:56:15 +0000 (23:56 -0700)]
Add Carotene - NVIDIA Hardware-Abstraction-Layer for ARM platforms
Elif Albuz [Tue, 5 Jul 2016 06:45:07 +0000 (23:45 -0700)]
Add Carotene - NVIDIA Hardware-Abstraction-Layer for ARM platforms
Alexander Alekhin [Mon, 4 Jul 2016 14:03:05 +0000 (14:03 +0000)]
Merge pull request #6760 from alalek:issue_6653
Alexander Alekhin [Mon, 4 Jul 2016 12:17:16 +0000 (12:17 +0000)]
Merge pull request #6768 from tomoaki0705:fixEstimateAffine3DThreshold
Tomoaki Teshima [Mon, 4 Jul 2016 10:34:47 +0000 (19:34 +0900)]
calib3d: compare error and threshold both in square
* resolve #5183
Alexander Alekhin [Mon, 4 Jul 2016 09:52:03 +0000 (09:52 +0000)]
Merge pull request #6761 from alalek:fix_warnings
Dikay900 [Tue, 31 May 2016 17:27:59 +0000 (19:27 +0200)]
Rephrase parts of the templates and use comments
Alexander Alekhin [Fri, 1 Jul 2016 17:17:16 +0000 (20:17 +0300)]
build: fix compiler warnings (GCC 5.3.1)
Alexander Alekhin [Fri, 1 Jul 2016 15:27:01 +0000 (15:27 +0000)]
Merge pull request #6745 from alalek:viz_samples
Alexander Alekhin [Fri, 1 Jul 2016 14:07:16 +0000 (17:07 +0300)]
cvtColor: fix inplace processing
Andrey Pavlenko [Fri, 1 Jul 2016 13:24:05 +0000 (13:24 +0000)]
Merge pull request #6734 from PkLab:doc_videoio_enums
Alexander Alekhin [Thu, 30 Jun 2016 14:10:27 +0000 (17:10 +0300)]
cmake: lapack optimized code requires cblas.h
Alexander Alekhin [Thu, 30 Jun 2016 14:07:38 +0000 (17:07 +0300)]
core: fix arguments types for cblas calls
Vadim Pisarevsky [Thu, 30 Jun 2016 17:17:03 +0000 (17:17 +0000)]
Merge pull request #6697 from wiryls:FileStorageBase64
Andrey Pavlenko [Thu, 30 Jun 2016 15:47:45 +0000 (15:47 +0000)]
Merge pull request #6740 from tomoaki0705:fixNeonCheckSmooth
Alexander Alekhin [Wed, 29 Jun 2016 13:35:48 +0000 (16:35 +0300)]
samples: repair viz tutorial
Alexander Alekhin [Thu, 30 Jun 2016 13:44:16 +0000 (13:44 +0000)]
Merge pull request #6558 from lletourn:master
Alexander Alekhin [Thu, 30 Jun 2016 13:20:51 +0000 (13:20 +0000)]
Merge pull request #5870 from IshankGulati:VideoCapture-fix
Alexander Alekhin [Thu, 30 Jun 2016 12:41:52 +0000 (12:41 +0000)]
Merge pull request #6731 from jokereactive:viz_sample
Maksim Shabunin [Thu, 30 Jun 2016 11:35:22 +0000 (11:35 +0000)]
Merge pull request #6603 from debjan:patch-1
Alexander Alekhin [Thu, 30 Jun 2016 08:02:19 +0000 (08:02 +0000)]
Merge pull request #6747 from ludv1x:master
Vitaliy Lyudvichenko [Wed, 29 Jun 2016 16:50:51 +0000 (19:50 +0300)]
Fixing of AutoBuffer::allocate(nsz) method
AutoBuffer::allocate(nsz) didn't work properly when
(sz < nsz < fixed_size). In this case sz remained unchanged.
Alexander Alekhin [Wed, 29 Jun 2016 11:55:08 +0000 (11:55 +0000)]
Merge pull request #6029 from sturkmen72:patch-7
Alexander Alekhin [Wed, 29 Jun 2016 11:03:47 +0000 (11:03 +0000)]
Merge pull request #6711 from Dubrzr:vs_compile_cuda_fix
Alexander Alekhin [Wed, 29 Jun 2016 11:00:49 +0000 (11:00 +0000)]
Merge pull request #6707 from tech2077:master
Tomoaki Teshima [Wed, 29 Jun 2016 02:17:14 +0000 (11:17 +0900)]
make NEON more similart to SSE2
Alexander Alekhin [Tue, 28 Jun 2016 14:21:54 +0000 (17:21 +0300)]
cmake: update arm toolchain
Alexander Alekhin [Tue, 28 Jun 2016 16:53:45 +0000 (16:53 +0000)]
Merge pull request #6736 from alalek:cmake_fix_install_path
PkLab.net [Tue, 28 Jun 2016 14:40:30 +0000 (16:40 +0200)]
Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums
# Resolved Conflicts:
# modules/videoio/include/opencv2/videoio.hpp
Alexander Alekhin [Tue, 28 Jun 2016 10:27:25 +0000 (13:27 +0300)]
cmake: fix install path
CMake doesn't work with empty paths ("") or paths which contains "./"
Alexander Alekhin [Tue, 28 Jun 2016 05:36:15 +0000 (05:36 +0000)]
Merge pull request #6730 from sturkmen72:patch-16
Alexander Alekhin [Tue, 28 Jun 2016 05:21:25 +0000 (05:21 +0000)]
Merge pull request #6619 from Slonegg:openni2_ir_stream
PkLab.net [Mon, 27 Jun 2016 17:17:51 +0000 (19:17 +0200)]
Use copydoc for the list of valid property identifier in VideoCapture and VideoWriter docs
PkLab.net [Mon, 27 Jun 2016 17:09:23 +0000 (19:09 +0200)]
Doxygen documentation for CAP_* enums (using current comments in code)
Dmitry Trifonov [Mon, 27 Jun 2016 17:04:59 +0000 (10:04 -0700)]
added support for OpenNI2 IR stream #4366
Alexander Alekhin [Mon, 27 Jun 2016 16:44:24 +0000 (16:44 +0000)]
Merge pull request #6733 from simonhaenisch:simonhaenisch-improve-watershed.py-example
Simon Hänisch [Mon, 27 Jun 2016 15:03:37 +0000 (17:03 +0200)]
update watershed.py: check if windows are still open
change the `while` loop to check if the two windows created by this example still exist, stop the program otherwise
Suleyman TURKMEN [Mon, 27 Jun 2016 13:38:47 +0000 (16:38 +0300)]
Update imgcodecs.hpp
sarthak [Mon, 27 Jun 2016 08:01:06 +0000 (13:31 +0530)]
opencv viz bug
removed binary
update