Andrey Pavlenko [Wed, 25 Dec 2013 15:00:25 +0000 (19:00 +0400)]
Merge pull request #2043 from ilya-lavrenov:tapi_hack
Andrey Pavlenko [Wed, 25 Dec 2013 15:00:06 +0000 (19:00 +0400)]
Merge pull request #2042 from vpisarev:ocl_facedetect8
Roman Donchenko [Wed, 25 Dec 2013 12:18:00 +0000 (16:18 +0400)]
Merge pull request #2045 from SpecLad:merge-2.4
Ilya Lavrenov [Mon, 23 Dec 2013 11:49:45 +0000 (15:49 +0400)]
removed unnecessary assert
Vadim Pisarevsky [Mon, 23 Dec 2013 17:29:31 +0000 (21:29 +0400)]
workaround for some strange bug on old Mac.
Andrey Pavlenko [Mon, 23 Dec 2013 15:19:00 +0000 (19:19 +0400)]
Merge pull request #2033 from ilya-lavrenov:tapi_normalize
Ilya Lavrenov [Fri, 20 Dec 2013 16:10:43 +0000 (20:10 +0400)]
added cv::normalize to T-API; implemented missed UMat::copyTo with mask
Andrey Pavlenko [Mon, 23 Dec 2013 15:09:59 +0000 (19:09 +0400)]
Merge pull request #2041 from ilya-lavrenov:tapi_mul_div
Roman Donchenko [Mon, 23 Dec 2013 14:50:17 +0000 (18:50 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
Vadim Pisarevsky [Mon, 23 Dec 2013 14:41:54 +0000 (18:41 +0400)]
removed extra whitespaces and hopefully fixed the test failures
Vadim Pisarevsky [Mon, 23 Dec 2013 11:28:50 +0000 (15:28 +0400)]
added OpenCL optimization for LBP-based face detector
Andrey Pavlenko [Mon, 23 Dec 2013 09:00:22 +0000 (13:00 +0400)]
Merge pull request #2035 from ilya-lavrenov:tapi_CamShift
Ilya Lavrenov [Sun, 22 Dec 2013 11:07:24 +0000 (15:07 +0400)]
fixed cv::multuply, cv::divide
Ilya Lavrenov [Sat, 21 Dec 2013 10:36:50 +0000 (14:36 +0400)]
refactored cv::CamShift and cv::meanShift
Andrey Pavlenko [Sat, 21 Dec 2013 08:44:05 +0000 (12:44 +0400)]
Merge pull request #2023 from krodyush:pullreq/2.4-opt-131126-cvt
Andrey Pavlenko [Fri, 20 Dec 2013 17:39:10 +0000 (21:39 +0400)]
Merge pull request #2030 from LeszekSwirski:fix-imgproc-ipp
Andrey Pavlenko [Fri, 20 Dec 2013 17:38:14 +0000 (21:38 +0400)]
Merge pull request #2032 from ilya-lavrenov:tapi_mulSpectrums
Ilya Lavrenov [Fri, 20 Dec 2013 14:39:57 +0000 (18:39 +0400)]
added cv::mulSpectrums to T-API
Vadim Pisarevsky [Fri, 20 Dec 2013 14:39:35 +0000 (18:39 +0400)]
started adding OpenCL acceleration of LBP-based object detectors
Andrey Pavlenko [Fri, 20 Dec 2013 13:57:09 +0000 (17:57 +0400)]
Merge pull request #1995 from akarsakov:ocl_pyramids
Roman Donchenko [Fri, 20 Dec 2013 13:54:01 +0000 (17:54 +0400)]
Merge pull request #1950 from GregoryMorse:patch-2
Roman Donchenko [Fri, 20 Dec 2013 13:06:27 +0000 (17:06 +0400)]
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
Roman Donchenko [Fri, 20 Dec 2013 13:04:17 +0000 (17:04 +0400)]
Merge pull request #1966 from asmorkalov:ocv_neon_support
Andrey Pavlenko [Fri, 20 Dec 2013 12:50:00 +0000 (16:50 +0400)]
Merge pull request #2014 from krodyush:pullreq/2.4-opt-131211-surf
Leszek Swirski [Fri, 20 Dec 2013 12:38:31 +0000 (12:38 +0000)]
imgproc: IPP compilation fix and minor cleanup
Alexander Smorkalov [Tue, 10 Dec 2013 07:22:29 +0000 (11:22 +0400)]
NEON instruction set control unified for regular and cross-compiler builds.
krodyush [Fri, 20 Dec 2013 09:51:51 +0000 (13:51 +0400)]
change code according reviewer suggesions
Vladimir Bystricky [Fri, 20 Dec 2013 08:33:39 +0000 (12:33 +0400)]
Remove TBB ifdef form code
Roman Donchenko [Fri, 20 Dec 2013 08:30:46 +0000 (12:30 +0400)]
Merge pull request #2021 from vpisarev:ocl_facedetect7
Roman Donchenko [Fri, 20 Dec 2013 07:57:29 +0000 (11:57 +0400)]
Merge pull request #1994 from StevenPuttemans:bugfix_3431
krodyush [Thu, 19 Dec 2013 18:56:46 +0000 (22:56 +0400)]
Improve ocl cvt_color performance for the following conversions: RGB<->BGR, RGB->Gray, RGB<->XYZ, RGB<->YCrCb, RGB<->YUV, and mRGBA<->RGBA.
The improvement was done basically by processing more than 1 pixel by each work-item and using vector's operations.
new performance tests were added
Andrey Pavlenko [Thu, 19 Dec 2013 15:28:57 +0000 (19:28 +0400)]
Merge pull request #2019 from ilya-lavrenov:tapi_repeat
Alexander Karsakov [Mon, 16 Dec 2013 08:55:14 +0000 (12:55 +0400)]
Added ocl::pyrUp to T-API
Andrey Pavlenko [Thu, 19 Dec 2013 13:08:52 +0000 (17:08 +0400)]
Merge pull request #1765 from ilya-lavrenov:cv_remap
Vadim Pisarevsky [Thu, 19 Dec 2013 12:57:02 +0000 (16:57 +0400)]
2 more fixes to calm down the doc builder
Andrey Pavlenko [Thu, 19 Dec 2013 12:47:18 +0000 (16:47 +0400)]
Merge pull request #2018 from ilya-lavrenov:tapi_dft
Andrey Pavlenko [Thu, 19 Dec 2013 12:46:58 +0000 (16:46 +0400)]
Merge pull request #2007 from krodyush:pullreq/2.4-opt-131202-haar
Andrey Pavlenko [Thu, 19 Dec 2013 12:46:40 +0000 (16:46 +0400)]
Merge pull request #2005 from krodyush:pullreq/2.4-opt-131114-extractCovData
Vadim Pisarevsky [Thu, 19 Dec 2013 12:31:30 +0000 (16:31 +0400)]
fixed various warnings from the “doc” and other builders
Andrey Pavlenko [Thu, 19 Dec 2013 12:14:42 +0000 (16:14 +0400)]
Merge pull request #2008 from krodyush:pullreq/2.4-opt-131209-hog
Vadim Pisarevsky [Thu, 19 Dec 2013 10:48:42 +0000 (14:48 +0400)]
converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.
Vadim Pisarevsky [Thu, 19 Dec 2013 10:29:28 +0000 (14:29 +0400)]
renamed OpenCL kernel filename; made some final changes
Ilya Lavrenov [Thu, 19 Dec 2013 10:27:21 +0000 (14:27 +0400)]
added cv::repeat to T-API
Vadim Pisarevsky [Thu, 19 Dec 2013 10:09:44 +0000 (14:09 +0400)]
some attempts to tune the performance
Alexander Karsakov [Mon, 9 Dec 2013 13:14:20 +0000 (17:14 +0400)]
Added ocl::pyrDown to T-API
Andrey Pavlenko [Thu, 19 Dec 2013 09:48:39 +0000 (13:48 +0400)]
Merge pull request #2006 from krodyush:pullreq/2.4-opt-131120-gfft
Ilya Lavrenov [Tue, 17 Dec 2013 13:36:26 +0000 (17:36 +0400)]
added cv::dft T-API test
Andrey Pavlenko [Thu, 19 Dec 2013 09:38:52 +0000 (13:38 +0400)]
Merge pull request #2009 from krodyush:pullreq/2.4-opt-131211-sepFilterSinglePass_final
Vladimir Bystricky [Thu, 19 Dec 2013 06:29:19 +0000 (10:29 +0400)]
Fix comment in the cmake file from SSDK to SDK
Andrey Pavlenko [Wed, 18 Dec 2013 15:35:04 +0000 (19:35 +0400)]
Merge pull request #2000 from apavlenko:license_copyright
Andrey Pavlenko [Wed, 18 Dec 2013 15:33:25 +0000 (19:33 +0400)]
adding LICENSE file and a sample of its reference in ocl.hpp
Andrey Pavlenko [Wed, 18 Dec 2013 15:13:22 +0000 (19:13 +0400)]
Merge pull request #2015 from apavlenko:2.4_fix_ts_rng-fill
Roman Donchenko [Wed, 18 Dec 2013 13:36:18 +0000 (17:36 +0400)]
Merge pull request #2011 from ilya-lavrenov:dft_dct
Andrey Pavlenko [Wed, 18 Dec 2013 13:27:39 +0000 (17:27 +0400)]
adding more than 4 channels random Mats support
if `Scalar:all` is used, Mats with 5+ channels cause errors
Andrey Pavlenko [Wed, 18 Dec 2013 13:05:17 +0000 (17:05 +0400)]
Merge pull request #2013 from apavlenko:2.4_fd_sample
Andrey Pavlenko [Wed, 18 Dec 2013 13:02:39 +0000 (17:02 +0400)]
adding timing for multi-threaded case
krodyush [Wed, 18 Dec 2013 10:27:51 +0000 (14:27 +0400)]
intel device guard was added because of perf degradation on some non intel platform.
Andrey Pavlenko [Wed, 18 Dec 2013 09:53:17 +0000 (13:53 +0400)]
Merge pull request #1997 from alalek:tapi_fix_memleaks
Andrey Pavlenko [Wed, 18 Dec 2013 09:46:14 +0000 (13:46 +0400)]
Merge pull request #2004 from ilya-lavrenov:tapi_umat_copyto
Vladimir Bystricky [Wed, 18 Dec 2013 07:46:52 +0000 (11:46 +0400)]
Delete end comma in enumerations
Vladimir Bystricky [Wed, 18 Dec 2013 06:55:09 +0000 (10:55 +0400)]
Add CV_CAP_INTELPERC and CV_CAP_PROP_INTELPERC_ prefixes to const_ignore_list
Vladimir Bystricky [Wed, 18 Dec 2013 05:59:24 +0000 (09:59 +0400)]
Fix errors in example (samples/cpp/intelperc_capture.cpp)
Andrey Pavlenko [Tue, 17 Dec 2013 20:15:02 +0000 (00:15 +0400)]
minor refactoring, no functional changes
Vadim Pisarevsky [Tue, 17 Dec 2013 16:55:49 +0000 (20:55 +0400)]
it finally works!!!
Vladimir Bystricky [Tue, 17 Dec 2013 14:39:52 +0000 (18:39 +0400)]
Fix build errors
krodyush [Tue, 17 Dec 2013 13:46:09 +0000 (17:46 +0400)]
update doc to be consisted with headers
Ilya Lavrenov [Tue, 17 Dec 2013 13:41:28 +0000 (17:41 +0400)]
typo
krodyush [Tue, 17 Dec 2013 13:12:57 +0000 (17:12 +0400)]
GFFT fix for linux build
Andrey Pavlenko [Tue, 17 Dec 2013 12:44:26 +0000 (16:44 +0400)]
Merge pull request #1917 from alalek:ocl_d3d
Andrey Pavlenko [Tue, 17 Dec 2013 12:42:44 +0000 (16:42 +0400)]
Merge pull request #1969 from KonstantinMatskevich:ocl_tapi_minmaxloc
Andrey Pavlenko [Tue, 17 Dec 2013 12:42:16 +0000 (16:42 +0400)]
Merge pull request #1992 from ElenaGvozdeva:ocl_medianFilter
Andrey Pavlenko [Tue, 17 Dec 2013 12:41:58 +0000 (16:41 +0400)]
Merge pull request #1998 from ilya-lavrenov:tapi_gemm
Vladimir Bystricky [Tue, 17 Dec 2013 12:13:55 +0000 (16:13 +0400)]
Fix notes about cmake files. Fix build warning.
Ilya Lavrenov [Tue, 17 Dec 2013 10:14:04 +0000 (14:14 +0400)]
fixed UMat::copyTo(UMat)
Vadim Pisarevsky [Tue, 17 Dec 2013 10:51:22 +0000 (14:51 +0400)]
trying to debug the new cascade
Vadim Pisarevsky [Tue, 17 Dec 2013 10:29:30 +0000 (14:29 +0400)]
almost finished opencl-ization of cascade classifier
krodyush [Tue, 17 Dec 2013 10:12:33 +0000 (14:12 +0400)]
optimize SURF by
Inlining and customizing sampling functions to reduce memory traffic and compute
Improve calcOrientation implementation.
Using more efficient rounding routines.
Removing unnecessary use of local memory
Roman Donchenko [Tue, 17 Dec 2013 10:11:50 +0000 (14:11 +0400)]
Merge pull request #1934 from vbystricky:ocl_boxFilter
krodyush [Tue, 17 Dec 2013 10:09:06 +0000 (14:09 +0400)]
optimize separable filter by
Added "sep_filter_singlepass" kernel that performs separable filtering in one kernel call
Added appropriate host part - sepFilter2D_SinglePass function and SingleStepSeparableFilterEngine_GPU class
Changed function declarations to enable their usage
krodyush [Tue, 17 Dec 2013 10:06:14 +0000 (14:06 +0400)]
Changes the datatype of the angle of the gradient for Intel platforms.
krodyush [Tue, 17 Dec 2013 10:04:10 +0000 (14:04 +0400)]
remove extra calculations from haar to be consistent with native implementation
krodyush [Tue, 17 Dec 2013 10:02:57 +0000 (14:02 +0400)]
HOST side optimization for GFFT
krodyush [Tue, 17 Dec 2013 10:01:01 +0000 (14:01 +0400)]
optimize Dx and Dy calcualtion to make it as single opencl kernel
Roman Donchenko [Tue, 17 Dec 2013 09:53:59 +0000 (13:53 +0400)]
Merge pull request #1881 from pentschev:defaultNorm_master
Roman Donchenko [Tue, 17 Dec 2013 09:21:47 +0000 (13:21 +0400)]
Merge pull request #1996 from SpecLad:merge-2.4
Roman Donchenko [Tue, 17 Dec 2013 09:19:59 +0000 (13:19 +0400)]
Merge pull request #1993 from StevenPuttemans:feature_2862
Roman Donchenko [Tue, 17 Dec 2013 09:17:25 +0000 (13:17 +0400)]
Merge pull request #1987 from pentschev:cv_completesymm_template_2.4
Konstantin Matskevich [Tue, 17 Dec 2013 08:42:38 +0000 (12:42 +0400)]
some fixes
Konstantin Matskevich [Thu, 5 Dec 2013 12:34:23 +0000 (16:34 +0400)]
minMaxLoc
Vladimir Bystricky [Tue, 17 Dec 2013 08:00:40 +0000 (12:00 +0400)]
Add set/get depth generator properties by default. Add documentation
Elena Gvozdeva [Tue, 17 Dec 2013 07:15:48 +0000 (11:15 +0400)]
Fixed condition for channels
Elena Gvozdeva [Tue, 17 Dec 2013 07:04:54 +0000 (11:04 +0400)]
Fixed medianFilter
Ilya Lavrenov [Sat, 14 Dec 2013 19:16:53 +0000 (23:16 +0400)]
added cv::gemm to T-API
Roman Donchenko [Mon, 16 Dec 2013 11:02:42 +0000 (15:02 +0400)]
Fixed build for the TLS-related stuff.
Elena Gvozdeva [Mon, 16 Dec 2013 14:06:11 +0000 (18:06 +0400)]
Fixed trailing whitespace
Alexander Alekhin [Mon, 16 Dec 2013 12:46:36 +0000 (16:46 +0400)]
umat: fix memory leaks
Roman Donchenko [Mon, 16 Dec 2013 11:02:12 +0000 (15:02 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
StevenPuttemans [Mon, 16 Dec 2013 10:05:53 +0000 (11:05 +0100)]
Fixed suggestion of bugfix 3431
Seems correct to me and builds fine
StevenPuttemans [Mon, 16 Dec 2013 09:47:24 +0000 (10:47 +0100)]
Fixed descripotorsCount to descriptorsCount
See feature 2862
Elena Gvozdeva [Mon, 9 Dec 2013 06:34:32 +0000 (10:34 +0400)]
Added ocl_medianFilter using Transparent API