1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Commit Graph

1057 Commits

Author SHA1 Message Date
Ilya Lavrenov c7fe162829 renamed **2 -> ** 2014-02-04 19:55:11 +04:00
Elena Gvozdeva 85d519b6c3 fixed 2014-02-04 10:54:02 +04:00
Andrey Pavlenko 9dede73d9f Merge pull request #2153 from scottbreyfogle:constrained-hough-lines 2014-02-03 17:35:15 +04:00
Roman Donchenko 109e71e4ef Merge pull request #2263 from ilya-lavrenov:include_fix 2014-02-03 17:25:12 +04:00
Roman Donchenko 652a0bd5ce Merge pull request #2262 from SpecLad:merge-2.4 2014-02-03 15:33:41 +04:00
Ilya Lavrenov 9a1e461450 fix for PR 2166 2014-02-03 14:47:32 +04:00
Roman Donchenko 2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Ilya Lavrenov e844c08203 some fixes and improvements in cv::matchTemplate 2014-02-02 19:20:37 +04:00
Scott Breyfogle aaa9be7c65 Merge remote-tracking branch 'original/master' into constrained-hough-lines 2014-01-31 14:27:51 -08:00
Scott Breyfogle b074c67a56 Add static cast to hough lines 2014-01-31 14:26:45 -08:00
Andrey Pavlenko c909a21035 Merge pull request #2219 from ilya-lavrenov:createHanningWindow 2014-01-31 19:25:29 +04:00
Andrey Pavlenko b0befeb1b3 Merge pull request #2232 from ilya-lavrenov:ABF_drop 2014-01-31 19:17:16 +04:00
Ilya Lavrenov c01e8e9361 removed ABF 2014-01-31 19:15:40 +04:00
Andrey Pavlenko 2c35438771 Merge pull request #2228 from ilya-lavrenov:tapi_experiments 2014-01-31 19:14:19 +04:00
Andrey Pavlenko 82bab2b03b Merge pull request #2236 from ilya-lavrenov:tapi_boxfilter 2014-01-31 19:04:49 +04:00
Alexander Alekhin 9300af90cd imgproc/intersection: fix loop index 2014-01-31 14:42:38 +04:00
Ilya Lavrenov 68f5dd4170 simplified cv::boxFilter OpenCL impl 2014-01-31 01:53:38 +04:00
Ivy Lee b7f2b671a2 Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer 2014-01-30 21:53:05 +00:00
Andrey Pavlenko 77bbd65fa6 Merge pull request #2220 from ilya-lavrenov:tapi_accumulate 2014-01-30 17:33:06 +04:00
Ilya Lavrenov 1ab1594d00 workaround 2014-01-30 17:26:56 +04:00
Ilya Lavrenov 372cdac07c moved kernelToStr to ocl.hpp 2014-01-30 15:23:11 +04:00
Ilya Lavrenov 231bc17de7 added conditional compilation 2014-01-30 13:07:13 +04:00
Ilya Lavrenov 1862dbc5ab fixed fp problem 2014-01-30 05:48:15 +04:00
Ilya Lavrenov 0d19cbcc7a added performance test 2014-01-30 02:01:38 +04:00
Ilya Lavrenov 6d64907f18 async 2014-01-30 00:19:18 +04:00
Ilya Lavrenov 6fa41c5a64 some experiments 2014-01-30 00:12:59 +04:00
Ilya Lavrenov faa6074f3d added performance test 2014-01-29 20:34:37 +04:00
Ilya Lavrenov 384a28622d added cv::calcHist to T-API (only for CV_8UC1 with 256 bins) 2014-01-29 20:19:15 +04:00
Ilya Lavrenov 7c96d98a24 implemented OpenCL version of cv::accumulate**** 2014-01-29 11:42:46 +04:00
Ilya Lavrenov 41bc5808c0 optimized createHanningWindow 2014-01-28 23:37:20 +04:00
Andrey Pavlenko fff5a6c058 Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid 2014-01-28 16:31:30 +04:00
Seunghoon Park eb9d7c4dd5 fixing bug #3345. use norm to make sure two matrices are the same. 2014-01-27 20:57:40 -05:00
Seunghoon Park 73389b2b9c Merge branch '2.4' into blur_border_isolated 2014-01-27 20:44:03 -05:00
Ilya Lavrenov 78c2b3ca2a refactored imgproc 2014-01-27 18:47:16 +04:00
Ilya Lavrenov 48a084c236 OpenCL version of cv::buildPyramid 2014-01-27 18:42:44 +04:00
Elena Gvozdeva 07a88d48e9 fixed 2014-01-24 11:41:23 +04:00
Elena Gvozdeva 4d86804f11 Fixed merge conflicts 2014-01-23 15:31:32 +04:00
Elena Gvozdeva 7bd8f9294d fixed 2014-01-23 14:50:30 +04:00
Elena Gvozdeva 8c5e19c270 fixed pref test 2014-01-23 14:50:29 +04:00
Elena Gvozdeva b4652e2cb3 Added perf test for ocl_matchTemplate 2014-01-23 14:50:29 +04:00
Elena Gvozdeva 2c0765b4d1 fixed trailing whitespace 2014-01-23 14:50:29 +04:00
Elena Gvozdeva 7e2bdb590f fixed 2014-01-23 14:50:29 +04:00
Elena Gvozdeva 4da1ba56b3 fixed 2014-01-23 14:50:29 +04:00
Elena Gvozdeva 47b572f99f fixed 2014-01-23 14:50:28 +04:00
Elena Gvozdeva da4d33ec26 Fixed test_match_template 2014-01-23 14:50:28 +04:00
Elena Gvozdeva 9de70c9a00 Fixed trailing whitespace 2014-01-23 14:50:28 +04:00
Elena Gvozdeva ba5d480f80 Fixed warnings 2014-01-23 14:50:28 +04:00
Elena Gvozdeva 86636dc265 Added ocl_matchTemplate( without dft) 2014-01-23 14:50:28 +04:00
Andrey Pavlenko ba77719914 Merge pull request #2189 from ilya-lavrenov:tapi_sepFilter2D_fix 2014-01-22 19:13:05 +04:00
Ilya Lavrenov d2ffd8ed21 implemented OpenCL version of cv::preCornerDetect 2014-01-22 13:46:26 +04:00