Commit Graph

209 Commits

Author SHA1 Message Date
Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Ilya Lavrenov da2790249e added NORM_L2SQR type to cv::norm 2014-01-10 18:45:52 +04:00
Ilya Lavrenov 1592234f1a added mask support to cv::norm, cv::meanStdDev 2014-01-10 18:45:40 +04:00
Ilya Lavrenov dd302158e0 fixed case with zero mask 2014-01-09 19:26:09 +04:00
Ilya Lavrenov 6ee0b6eb56 added mask support to cv::norm, cv::meanStdDev 2014-01-09 13:49:42 +04:00
Ilya Lavrenov 6b9ebcbf3d deleted extra semicolons 2014-01-07 02:52:30 +04:00
Ilya Lavrenov 3a4d4080f4 fixed overflow for cv::norm NORM_L2 2014-01-04 15:20:50 +04:00
Ilya Lavrenov 3e1bec5248 added OpenCL version of cv::patchNaNs 2013-12-30 19:53:03 +04:00
Ilya Lavrenov 09d25e11c6 fixed bug #3341 2013-12-30 16:47:54 +04:00
Ilya Lavrenov 6b64257c81 added OpenCL version of cv::scaleAdd 2013-12-29 18:46:25 +04:00
Ilya Lavrenov abcf8d9e61 implemented OpenCL version of cv::convertScaleAbs 2013-12-29 18:01:19 +04:00
Andrey Pavlenko 4a6c2ce378 Merge pull request #2081 from ilya-lavrenov:tapi_perf 2013-12-28 22:06:12 +04:00
Ilya Lavrenov 31e6251793 added new perf tests to core 2013-12-27 20:02:12 +04:00
Ilya Lavrenov a7d2830d3f added cv::mixChannels to T-API 2013-12-27 13:14:37 +04:00
Ilya Lavrenov 4c23059209 added cv::inRange to T-API 2013-12-25 18:22:41 +04:00
Andrey Pavlenko 0966e5ffa1 Merge pull request #2033 from ilya-lavrenov:tapi_normalize 2013-12-23 19:19:00 +04:00
Ilya Lavrenov e3d23918fa added cv::normalize to T-API; implemented missed UMat::copyTo with mask 2013-12-23 19:17:35 +04:00
Ilya Lavrenov febb200eee fixed cv::multuply, cv::divide 2013-12-22 15:49:36 +04:00
Ilya Lavrenov c33a7cd7bf added cv::mulSpectrums to T-API 2013-12-20 18:41:20 +04:00
Andrey Pavlenko dde1d6b636 Merge pull request #2018 from ilya-lavrenov:tapi_dft 2013-12-19 16:47:19 +04:00
Ilya Lavrenov c8cbfe5382 added cv::dft T-API test 2013-12-19 13:42:16 +04:00
Andrey Pavlenko 388d0ef182 Merge pull request #2004 from ilya-lavrenov:tapi_umat_copyto 2013-12-18 13:46:14 +04:00
Andrey Pavlenko 586a5cb6db Merge pull request #1969 from KonstantinMatskevich:ocl_tapi_minmaxloc 2013-12-17 16:42:44 +04:00
Ilya Lavrenov ac030c16f1 fixed UMat::copyTo(UMat) 2013-12-17 15:23:39 +04:00
Konstantin Matskevich 904dac7670 minMaxLoc 2013-12-17 12:43:21 +04:00
Ilya Lavrenov 2f34bb9aa0 added cv::gemm to T-API 2013-12-16 19:12:27 +04:00
Ilya Lavrenov 558c4a2b1d implemented UMat::convertTo 2013-12-15 14:15:30 +04:00
Andrey Pavlenko c9ed05c3bd Merge pull request #1981 from ilya-lavrenov:tapi_sqrt 2013-12-13 19:34:28 +04:00
Ilya Lavrenov e30875bcef fixed UMat sync problems 2013-12-13 18:38:12 +04:00
Ilya Lavrenov 1d6715e58a added cv::sqrt to T-API (using built-in sqrt OpenCL function) 2013-12-12 18:12:30 +04:00
Andrey Pavlenko b0a9220de8 Merge pull request #1889 from alalek:ocl_core_dynamic_runtime 2013-12-12 17:27:34 +04:00
Alexander Alekhin 3bbf51fbfb ocl: disabled test for Split (there are problems with OutputArray and getMatRef) 2013-12-11 16:46:08 +04:00
Ilya Lavrenov 5566d31468 more strict checks outside ROI 2013-12-10 19:30:14 +04:00
Roman Donchenko 9d87f9c974 Merge pull request #1956 from ilya-lavrenov:tapi_split_merge 2013-12-09 16:56:06 +04:00
Ilya Lavrenov c16c9a2e8e added cv::split to T-API 2013-12-08 16:30:17 +04:00
Ilya Lavrenov b6c33bf86b added cv::norm to T-API 2013-12-08 15:27:48 +04:00
Ilya Lavrenov cd3f7fbf05 added cv::merge to T-API 2013-12-08 13:49:28 +04:00
Elena Gvozdeva f5a01f15a5 Fixed test for ocl_flip 2013-12-06 15:53:00 +04:00
Elena Gvozdeva b930028727 Added cv::flip using Transparent API 2013-12-05 17:54:05 +04:00
Ilya Lavrenov 49e729f89d ability to use cv::PSNR with transparent cv::norm 2013-12-04 00:51:55 +04:00
Ilya Lavrenov 28575c1969 added cv::countNonZero to T-API 2013-12-04 00:51:32 +04:00
Ilya Lavrenov 997ec60839 added OCL-TAPI arithm tests 2013-12-04 00:50:02 +04:00
Konstantin Matskevich 14dccdf23d T-API cv::log, cv::exp, cv::magnitude, cv::phase 2013-12-03 14:07:00 +04:00
Andrey Pavlenko 0a624ee67d Merge pull request #1901 from vpisarev:ocl_svm3 2013-12-03 11:20:26 +04:00
Roman Donchenko b27d7d2a61 Merge pull request #1886 from ilya-lavrenov:tapi_lut 2013-12-02 12:28:18 +04:00
Vadim Pisarevsky d7f4a223cf fixed several compile errors/warnings; reacted on the PR comments 2013-12-01 20:58:30 +04:00
Vadim Pisarevsky 6da5d21331 fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance 2013-12-01 03:12:19 +04:00
Ilya Lavrenov 09795e3265 added cv::resize INTER_AREA to T-API 2013-11-29 17:57:37 +04:00
Ilya Lavrenov 4eba74ee19 added cv::LUT to T-API 2013-11-28 12:31:04 +04:00
Ilya Lavrenov 9d23a0cb81 fixed ocl_arithm_op; fix for 3-channel images is needed 2013-11-25 14:21:12 +04:00