Roman Donchenko [Tue, 8 Jul 2014 10:33:56 +0000 (14:33 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
Alexander Alekhin [Thu, 3 Jul 2014 13:02:40 +0000 (13:02 +0000)]
Merge pull request #2932 from ilya-lavrenov:tapi_other_vendors
Ilya Lavrenov [Thu, 3 Jul 2014 09:45:55 +0000 (13:45 +0400)]
use vectors for devices of all vendors
Alexander Alekhin [Thu, 3 Jul 2014 09:26:52 +0000 (09:26 +0000)]
Merge pull request #2931 from alalek:mac_fix_master
Alexander Alekhin [Thu, 3 Jul 2014 09:26:05 +0000 (09:26 +0000)]
Merge pull request #2897 from vbystricky:oclopt_sepFilter2D
Alexander Alekhin [Thu, 3 Jul 2014 08:18:19 +0000 (12:18 +0400)]
ocl: add try-catch for OpenCL device getter
Ilya Lavrenov [Tue, 1 Jul 2014 10:31:25 +0000 (14:31 +0400)]
fixed warnings
Alexander Alekhin [Wed, 2 Jul 2014 19:06:45 +0000 (19:06 +0000)]
Merge pull request #2928 from ilya-lavrenov:tapi_warp_fix
Ilya Lavrenov [Wed, 2 Jul 2014 15:32:10 +0000 (19:32 +0400)]
fixed cv::warpPerspective
Vadim Pisarevsky [Wed, 2 Jul 2014 14:25:52 +0000 (14:25 +0000)]
Merge pull request #2915 from SpecLad:core-useless-casts
Vadim Pisarevsky [Wed, 2 Jul 2014 14:24:09 +0000 (14:24 +0000)]
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
Vadim Pisarevsky [Wed, 2 Jul 2014 14:22:55 +0000 (14:22 +0000)]
Merge pull request #2856 from sanchom:master
Alexander Alekhin [Wed, 2 Jul 2014 12:18:10 +0000 (12:18 +0000)]
Merge pull request #2922 from ilya-lavrenov:mac_fix
Vadim Pisarevsky [Wed, 2 Jul 2014 09:56:59 +0000 (09:56 +0000)]
Merge pull request #2923 from alalek:ocl_default_device_ignore_cpu
Vadim Pisarevsky [Wed, 2 Jul 2014 09:55:51 +0000 (09:55 +0000)]
Merge pull request #2913 from ilya-lavrenov:sse2_precornerdetect
Alexander Alekhin [Wed, 2 Jul 2014 09:14:48 +0000 (09:14 +0000)]
Merge pull request #2830 from mlyashko:moments
Alexander Alekhin [Tue, 1 Jul 2014 16:02:02 +0000 (20:02 +0400)]
ocl: fix mac and superres test
Ilya Lavrenov [Tue, 1 Jul 2014 10:53:39 +0000 (14:53 +0400)]
fix for fisheye
Vadim Pisarevsky [Tue, 1 Jul 2014 18:41:14 +0000 (18:41 +0000)]
Merge pull request #2905 from Jazmann:2.4
Vadim Pisarevsky [Tue, 1 Jul 2014 17:31:37 +0000 (17:31 +0000)]
Merge pull request #2911 from ilya-lavrenov:sse2_convert_scale_abs
Vadim Pisarevsky [Tue, 1 Jul 2014 17:16:22 +0000 (17:16 +0000)]
Merge pull request #2895 from fradelg:master
Vadim Pisarevsky [Tue, 1 Jul 2014 16:40:08 +0000 (16:40 +0000)]
Merge pull request #2917 from mmaraya:bug_3872
Alexander Alekhin [Tue, 1 Jul 2014 13:21:35 +0000 (13:21 +0000)]
Merge pull request #2906 from ilya-lavrenov:tapi_transpose
Vadim Pisarevsky [Tue, 1 Jul 2014 11:02:04 +0000 (11:02 +0000)]
Merge pull request #2914 from alalek:fix2.4
Ilya Lavrenov [Tue, 1 Jul 2014 10:31:25 +0000 (14:31 +0400)]
fixed warnings
Alexander Alekhin [Tue, 1 Jul 2014 10:24:14 +0000 (14:24 +0400)]
ocl: don't use OpenCL CPU device in default setup
Mike Maraya [Tue, 1 Jul 2014 02:17:52 +0000 (22:17 -0400)]
test.py: Check if camera_calibration.tar.gz file exists before downloading it, opencv bug #3782
Ilya Lavrenov [Sun, 29 Jun 2014 17:03:16 +0000 (21:03 +0400)]
sse2 optimization of cv::convertScaleAbs
Ilya Lavrenov [Fri, 27 Jun 2014 10:03:05 +0000 (14:03 +0400)]
optimized cv::transpose inplace
Ilya Lavrenov [Fri, 27 Jun 2014 08:44:32 +0000 (12:44 +0400)]
cv::transpose
Alexander Alekhin [Mon, 30 Jun 2014 14:59:36 +0000 (14:59 +0000)]
Merge pull request #2907 from ilya-lavrenov:tapi_perf_transpose
Ilya Lavrenov [Fri, 27 Jun 2014 10:06:32 +0000 (14:06 +0400)]
added perf test for transpose inplace
Roman Donchenko [Mon, 30 Jun 2014 12:12:04 +0000 (16:12 +0400)]
Remove a couple of useless casts in core headers
This helps users who compile their code with -Wuseless-cast.
Alexander Alekhin [Mon, 30 Jun 2014 12:03:20 +0000 (16:03 +0400)]
fix bug with invalid signature size (should not be less than signatureLength())
Alexander Alekhin [Mon, 30 Jun 2014 12:03:07 +0000 (16:03 +0400)]
fix python tests
Alexander Alekhin [Mon, 30 Jun 2014 11:59:13 +0000 (11:59 +0000)]
Merge pull request #2869 from ilya-lavrenov:tapi_warps
Alexander Alekhin [Mon, 30 Jun 2014 10:06:54 +0000 (10:06 +0000)]
Merge pull request #2876 from vbystricky:oclopt_integralsum
Alexander Alekhin [Mon, 30 Jun 2014 10:05:24 +0000 (10:05 +0000)]
Merge pull request #2899 from ilya-lavrenov:tapi_ex
Alexander Alekhin [Mon, 30 Jun 2014 10:04:04 +0000 (10:04 +0000)]
Merge pull request #2886 from ilya-lavrenov:tapi_inrange
Alexander Alekhin [Mon, 30 Jun 2014 10:02:41 +0000 (10:02 +0000)]
Merge pull request #2829 from ilya-lavrenov:tapi_cvtcolor
Ilya Lavrenov [Sun, 29 Jun 2014 21:47:51 +0000 (01:47 +0400)]
SSE2 optimization of cv::preCornerDetect
Ilya Lavrenov [Thu, 26 Jun 2014 14:15:13 +0000 (18:15 +0400)]
optimized some operations
Alexander Alekhin [Fri, 27 Jun 2014 08:21:06 +0000 (08:21 +0000)]
Merge pull request #2852 from ilya-lavrenov:tapi_abs
Roman Donchenko [Thu, 26 Jun 2014 13:40:25 +0000 (17:40 +0400)]
Merge pull request #2626 from KayKwon:matlab_formatter
Roman Donchenko [Thu, 26 Jun 2014 13:35:07 +0000 (17:35 +0400)]
Merge pull request #2672 from a-wi:findContours
Roman Donchenko [Thu, 26 Jun 2014 13:29:25 +0000 (17:29 +0400)]
Merge pull request #2774 from 23pointsNorth:lsd-nfa-fix
Roman Donchenko [Thu, 26 Jun 2014 13:28:44 +0000 (17:28 +0400)]
Merge pull request #2766 from akarsakov:pyr_border_constant
Roman Donchenko [Thu, 26 Jun 2014 13:24:24 +0000 (17:24 +0400)]
Merge pull request #2858 from 23pointsNorth:patch-3
Roman Donchenko [Thu, 26 Jun 2014 13:22:53 +0000 (17:22 +0400)]
Merge pull request #2824 from abidrahmank:pylsd
vbystricky [Thu, 26 Jun 2014 11:43:40 +0000 (15:43 +0400)]
Change local size
Ilya Lavrenov [Thu, 26 Jun 2014 09:25:24 +0000 (13:25 +0400)]
ported changes from PR #2867
Ilya Lavrenov [Thu, 26 Jun 2014 09:18:03 +0000 (13:18 +0400)]
added ocl_** function
Ilya Lavrenov [Thu, 26 Jun 2014 09:13:01 +0000 (13:13 +0400)]
reverted to original plain C++ code
mlyashko [Wed, 25 Jun 2014 12:07:33 +0000 (16:07 +0400)]
added perftest for moments
vbystricky [Thu, 26 Jun 2014 08:46:03 +0000 (12:46 +0400)]
Optimize OpenCL version of sepFilter2D
Andrey Pavlenko [Wed, 25 Jun 2014 17:12:20 +0000 (17:12 +0000)]
Merge pull request #2894 from vpisarev:cleanup_project_tree1
Vadim Pisarevsky [Wed, 25 Jun 2014 16:22:56 +0000 (20:22 +0400)]
fixed some more compile warnings on Windows
Roman Donchenko [Wed, 25 Jun 2014 12:32:17 +0000 (16:32 +0400)]
Merge pull request #2880 from GravityJack:SparseMatIterator-build-fix
Roman Donchenko [Wed, 25 Jun 2014 12:27:33 +0000 (16:27 +0400)]
Merge pull request #2891 from nisargthakkar:dims_zero_on_release
Vadim Pisarevsky [Wed, 25 Jun 2014 12:17:52 +0000 (16:17 +0400)]
fixed compile warnings on Windows
Fco. Javier Delgado del Hoyo [Wed, 25 Jun 2014 09:49:26 +0000 (11:49 +0200)]
Change comment according to fix
Fco. Javier Delgado del Hoyo [Wed, 25 Jun 2014 09:46:05 +0000 (11:46 +0200)]
Fix GCC 4.9 compiler warning
Vadim Pisarevsky [Tue, 24 Jun 2014 19:05:24 +0000 (23:05 +0400)]
removed extra whitespaces
Vadim Pisarevsky [Tue, 24 Jun 2014 17:16:09 +0000 (21:16 +0400)]
put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.
Alexander Alekhin [Tue, 24 Jun 2014 16:19:52 +0000 (16:19 +0000)]
Merge pull request #2881 from mlyashko:moments_opt
Alexander Alekhin [Tue, 24 Jun 2014 16:12:42 +0000 (16:12 +0000)]
Merge pull request #2786 from ElenaGvozdeva:ocl_matchTemplate
Vadim Pisarevsky [Tue, 24 Jun 2014 15:18:51 +0000 (19:18 +0400)]
removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps.
some of the stuff will be moved to opencv_contrib module.
in order to make this PR pass buildbot, please, comment off opencv_legacy, opencv_contrib and opencv_softcascade test runs.
vbystricky [Thu, 19 Jun 2014 10:39:49 +0000 (14:39 +0400)]
Change kernel for optimization. Remove restriction to align data
Fix kernel compilation errors on AMD system
Fix licanse information in cl file
Support CV_64F destination type
Change build options of the kernel
Optimize sum of square
Remove separate kernel for integral square
Increase epsilon for perfomance tests
Increase epsilon for perfomance tests
Test double support on AMD devices
Fix some issues
Try to fix problems with AMD device
Try to solve problem with AMD device
Fix error of destination size in kernel
Fix warnings
Vadim Pisarevsky [Tue, 24 Jun 2014 12:06:19 +0000 (12:06 +0000)]
Merge pull request #2889 from Ilya-Krylov:fisheye
Vadim Pisarevsky [Tue, 24 Jun 2014 11:52:36 +0000 (11:52 +0000)]
Merge pull request #2892 from PhilLab:patch-1
Jasper [Tue, 24 Jun 2014 10:52:56 +0000 (11:52 +0100)]
Fix for VTK6.2 issue.
PhilLab [Tue, 24 Jun 2014 09:35:22 +0000 (11:35 +0200)]
Updates python feature matching tutorial
The given ORB parameter was misspelled
Nisarg Thakkar [Mon, 23 Jun 2014 14:45:23 +0000 (20:15 +0530)]
Fix for Bug#3757: All dimension values are 0 after release is called
Alexander Alekhin [Mon, 23 Jun 2014 14:27:10 +0000 (14:27 +0000)]
Merge pull request #2887 from ilya-lavrenov:ipp_morph_fix
Alexander Alekhin [Mon, 23 Jun 2014 14:23:26 +0000 (14:23 +0000)]
Merge pull request #2874 from vbystricky:ocl_LUTAMDfix
Ilya Krylov [Mon, 23 Jun 2014 13:06:40 +0000 (17:06 +0400)]
Fixed android and windows x64 build issues
Ilya Lavrenov [Sat, 21 Jun 2014 15:17:03 +0000 (19:17 +0400)]
optimized cv::inRange
Ilya Lavrenov [Wed, 11 Jun 2014 15:30:10 +0000 (19:30 +0400)]
added 32s to 32u conversion
Elena Gvozdeva [Tue, 10 Jun 2014 06:37:51 +0000 (10:37 +0400)]
Fixed core for CCORR and SQDIFF. Used float instead of int for CV_8U. Fixed conditions for call dft.
mlyashko [Fri, 20 Jun 2014 07:55:17 +0000 (11:55 +0400)]
replaced factors computation by precomputed values, added kernel for
binary mode
Ilya Lavrenov [Wed, 4 Jun 2014 11:24:29 +0000 (15:24 +0400)]
cvtColor - optimized index calculations; usage of build-in functions
Ilya Lavrenov [Sun, 22 Jun 2014 15:18:14 +0000 (19:18 +0400)]
added extra condition
Alexander Alekhin [Fri, 20 Jun 2014 13:49:14 +0000 (13:49 +0000)]
Merge pull request #2790 from akarsakov:ocl_pyrUp_unroll
Alexander Alekhin [Fri, 20 Jun 2014 08:49:36 +0000 (08:49 +0000)]
Merge pull request #2878 from vbystricky:ocl_integral_sqsum_perf_test
Alexander Alekhin [Fri, 20 Jun 2014 08:47:51 +0000 (08:47 +0000)]
Merge pull request #2864 from ilya-lavrenov:tapi_boxfilter
Alexander Alekhin [Fri, 20 Jun 2014 08:47:18 +0000 (08:47 +0000)]
Merge pull request #2847 from ilya-lavrenov:tapi_pow
Alexander Alekhin [Fri, 20 Jun 2014 08:46:32 +0000 (08:46 +0000)]
Merge pull request #2840 from ilya-lavrenov:tapi_calchist
Marc Rollins [Thu, 19 Jun 2014 21:14:10 +0000 (14:14 -0700)]
Fixing build error when using post-increment operator.
vbystricky [Thu, 19 Jun 2014 14:52:25 +0000 (18:52 +0400)]
Increase epsilon for pass sanity check
vbystricky [Thu, 19 Jun 2014 14:09:23 +0000 (18:09 +0400)]
Fix error
vbystricky [Thu, 19 Jun 2014 13:45:04 +0000 (17:45 +0400)]
Change threshold
vbystricky [Thu, 19 Jun 2014 13:07:09 +0000 (17:07 +0400)]
Add peromance tests for OCL integral sum of square
Roman Donchenko [Thu, 19 Jun 2014 12:52:00 +0000 (16:52 +0400)]
Merge pull request #2870 from 23pointsNorth:patch-5
Roman Donchenko [Thu, 19 Jun 2014 12:51:37 +0000 (16:51 +0400)]
Merge pull request #2868 from neo008:2.4
Andrey Pavlenko [Thu, 19 Jun 2014 09:08:32 +0000 (09:08 +0000)]
Merge pull request #2843 from berak:f_export_bow_24
Roman Donchenko [Thu, 19 Jun 2014 07:57:51 +0000 (11:57 +0400)]
Merge pull request #2832 from BRAINSia:20140605_Upstream
Alexander Alekhin [Wed, 18 Jun 2014 13:19:11 +0000 (13:19 +0000)]
Merge pull request #2846 from alalek:2.4_fix_python_warnings
Andrey Pavlenko [Wed, 18 Jun 2014 12:13:13 +0000 (16:13 +0400)]
Merge pull request #2863 from apavlenko:disable_cuda_stubs_defaults
vbystricky [Wed, 18 Jun 2014 11:44:56 +0000 (15:44 +0400)]
Change uchar2 to short
vbystricky [Wed, 18 Jun 2014 11:03:09 +0000 (15:03 +0400)]
Move some variables into #ifdef