Roman Donchenko [Mon, 30 Dec 2013 12:36:35 +0000 (16:36 +0400)]
Merge commit '
83cdd43a' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/version.hpp
Roman Donchenko [Mon, 30 Dec 2013 12:34:59 +0000 (16:34 +0400)]
Merge commit '
f22d9a23' into merge-2.4 (-s ours)
Andrey Pavlenko [Sat, 28 Dec 2013 18:06:12 +0000 (22:06 +0400)]
Merge pull request #2081 from ilya-lavrenov:tapi_perf
Andrey Pavlenko [Sat, 28 Dec 2013 18:05:49 +0000 (22:05 +0400)]
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
Andrey Pavlenko [Fri, 27 Dec 2013 18:38:08 +0000 (22:38 +0400)]
Merge pull request #2055 from vbystricky:ocl_sepFilter2D
Ilya Lavrenov [Fri, 27 Dec 2013 17:57:20 +0000 (21:57 +0400)]
disabled cv::split perf test
Roman Donchenko [Fri, 27 Dec 2013 16:23:56 +0000 (20:23 +0400)]
Merge pull request #2077 from ilya-lavrenov:tapi_context
Ilya Lavrenov [Fri, 27 Dec 2013 12:33:18 +0000 (16:33 +0400)]
added new perf tests to core
vbystricky [Fri, 27 Dec 2013 12:26:34 +0000 (16:26 +0400)]
Change threshold from 2.0 to 1.0 in the test
vbystricky [Fri, 27 Dec 2013 12:21:32 +0000 (16:21 +0400)]
Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR
Andrey Pavlenko [Fri, 27 Dec 2013 11:49:27 +0000 (15:49 +0400)]
Merge pull request #2034 from pentschev:ocl_features2d_orb_master
Andrey Pavlenko [Fri, 27 Dec 2013 11:44:11 +0000 (15:44 +0400)]
Merge pull request #2063 from vpisarev:ocl_moments
Andrey Pavlenko [Fri, 27 Dec 2013 11:38:51 +0000 (15:38 +0400)]
Merge pull request #2076 from ilya-lavrenov:tapi_dft
Ilya Lavrenov [Fri, 27 Dec 2013 10:02:03 +0000 (14:02 +0400)]
this commit prevents segfaults in case of opencl disabled
Ilya Lavrenov [Fri, 27 Dec 2013 09:59:55 +0000 (13:59 +0400)]
some fixes of cv::mixChannels
Ilya Lavrenov [Fri, 27 Dec 2013 09:39:29 +0000 (13:39 +0400)]
disabled cv::dft opencl impl for CPU devices
Ilya Lavrenov [Fri, 27 Dec 2013 09:18:31 +0000 (13:18 +0400)]
fixed getUMatIndex
Ilya Lavrenov [Thu, 26 Dec 2013 14:48:43 +0000 (18:48 +0400)]
added cv::mixChannels to T-API
Peter Andreas Entschev [Sat, 21 Dec 2013 01:04:58 +0000 (23:04 -0200)]
OCL: included ORB featured detector/descriptor extractor.
Vadim Pisarevsky [Thu, 26 Dec 2013 19:29:04 +0000 (23:29 +0400)]
improved performance of moments (on 720p or larger images)
Vadim Pisarevsky [Thu, 26 Dec 2013 18:00:29 +0000 (22:00 +0400)]
hopefully fixed test failures and complains from the doc builder
Andrey Pavlenko [Thu, 26 Dec 2013 16:37:33 +0000 (20:37 +0400)]
Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject
Andrey Pavlenko [Thu, 26 Dec 2013 15:38:01 +0000 (19:38 +0400)]
Merge pull request #2066 from ilya-lavrenov:tapi_ocl
Andrey Pavlenko [Thu, 26 Dec 2013 15:20:12 +0000 (19:20 +0400)]
Merge pull request #2028 from KonstantinMatskevich:ocl_tapi_morphology
Ilya Lavrenov [Thu, 26 Dec 2013 12:17:06 +0000 (16:17 +0400)]
added cv::calcBackProject for 2-dimensional histograms
Andrey Pavlenko [Thu, 26 Dec 2013 13:27:05 +0000 (17:27 +0400)]
Merge pull request #2054 from alalek:ocl_tapi_dev_selection
Konstantin Matskevich [Thu, 26 Dec 2013 13:16:55 +0000 (17:16 +0400)]
hope last fix
Ilya Lavrenov [Thu, 26 Dec 2013 13:14:20 +0000 (17:14 +0400)]
fixed warning [ -Wreorder ]
Ilya Lavrenov [Thu, 26 Dec 2013 13:13:26 +0000 (17:13 +0400)]
removed unnecessary data copying
Ilya Lavrenov [Mon, 23 Dec 2013 13:37:41 +0000 (17:37 +0400)]
ported cv::calcBackProject to T-API
Vadim Pisarevsky [Thu, 26 Dec 2013 09:25:00 +0000 (13:25 +0400)]
tuned the speed for OpenCL-based moments (still slower than the single-thread SSE2 CPU code :( )
Konstantin Matskevich [Thu, 26 Dec 2013 06:45:09 +0000 (10:45 +0400)]
not synchronous kernel's run
Konstantin Matskevich [Mon, 23 Dec 2013 08:27:39 +0000 (12:27 +0400)]
some fixes
Konstantin Matskevich [Wed, 18 Dec 2013 05:37:57 +0000 (09:37 +0400)]
morphology
Alexander Alekhin [Wed, 25 Dec 2013 14:41:24 +0000 (18:41 +0400)]
fixes
Vadim Pisarevsky [Wed, 25 Dec 2013 22:57:08 +0000 (02:57 +0400)]
moments work now and work more or less fast
Andrey Pavlenko [Wed, 25 Dec 2013 20:14:23 +0000 (00:14 +0400)]
Merge pull request #2046 from ilya-lavrenov:tapi_inrange
Andrey Pavlenko [Wed, 25 Dec 2013 20:13:28 +0000 (00:13 +0400)]
Merge pull request #1984 from ilya-lavrenov:tapi_perf
Andrey Pavlenko [Wed, 25 Dec 2013 20:05:13 +0000 (00:05 +0400)]
Merge pull request #2053 from KonstantinMatskevich:ocl_bugfix_eqhist
Vadim Pisarevsky [Wed, 25 Dec 2013 17:09:23 +0000 (21:09 +0400)]
experimental moments implementation (does not work yet)
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
Ilya Lavrenov [Mon, 23 Dec 2013 15:37:59 +0000 (19:37 +0400)]
added cv::inRange to T-API
Ilya Lavrenov [Fri, 13 Dec 2013 15:35:30 +0000 (19:35 +0400)]
added perf tests for T-API core functions
vbystricky [Wed, 25 Dec 2013 14:05:07 +0000 (18:05 +0400)]
Fix compilation warnings
vbystricky [Wed, 25 Dec 2013 11:39:30 +0000 (15:39 +0400)]
Add ocl implementation of the sepFilter2D into img_proc module.
Roman Donchenko [Wed, 25 Dec 2013 12:18:00 +0000 (16:18 +0400)]
Merge pull request #2045 from SpecLad:merge-2.4
Alexander Alekhin [Wed, 25 Dec 2013 10:39:21 +0000 (14:39 +0400)]
core/ocl: temporary move device selection from ocl module
Konstantin Matskevich [Wed, 25 Dec 2013 11:02:56 +0000 (15:02 +0400)]
bugfix in equalizeHist
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
Roman Donchenko [Mon, 23 Dec 2013 11:53:11 +0000 (15:53 +0400)]
Merge pull request #2039 from asmorkalov:ocv_version_inc3
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
Roman Donchenko [Mon, 23 Dec 2013 08:45:49 +0000 (12:45 +0400)]
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
Alexander Smorkalov [Mon, 23 Dec 2013 07:31:41 +0000 (11:31 +0400)]
OpenCV version++; OpenCV Manager version++.
Alexander Smorkalov [Fri, 20 Dec 2013 12:32:34 +0000 (16:32 +0400)]
Code review fixes.
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
Alexander Smorkalov [Fri, 20 Dec 2013 05:46:03 +0000 (09:46 +0400)]
Build fixes for case where HAVE_CUDA==OFF.
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 Smorkalov [Thu, 19 Dec 2013 14:36:02 +0000 (18:36 +0400)]
Build fixes for GPU module.
Alexander Smorkalov [Thu, 19 Dec 2013 14:02:59 +0000 (18:02 +0400)]
Warious fixes for case where HAVE_CUDA==OFF.
Alexander Smorkalov [Thu, 19 Dec 2013 13:41:04 +0000 (17:41 +0400)]
Additional ENABLE_DYNAMIC_CUDA option implemented in cmake. Warning fixes and refactoring.
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
Alexander Smorkalov [Thu, 19 Dec 2013 12:42:11 +0000 (16:42 +0400)]
Dynamic CUDA support library reimplemented as OpenCV module.
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