mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-13 16:09:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,585 Commits 6 Branches 127 Tags 3 GiB
37580687e6
Commit Graph

238 Commits

Author SHA1 Message Date
Roman Donchenko
bd5d8404c9 Merge pull request #2393 from ilya-lavrenov:coverity 2014-02-26 12:16:36 +04:00
Roman Donchenko
48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
 2014-02-25 15:02:24 +04:00
Ilya Lavrenov
32eb38ec98 fixed defects from coverity.com 2014-02-23 20:21:08 +04:00
Alexander Smorkalov
4c1ed13846 Warning fixes for GCC 4.8. 2014-02-18 23:53:35 +04:00
Ilya Lavrenov
8150c1b7e4 added [s|l]rgb <-> lab conversion 2014-02-14 18:45:56 +04:00
Alexander Alekhin
ce992c8269 ocl: update gftt 2014-02-07 14:51:59 +04:00
Andrey Pavlenko
4b31b9cb8c Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter 2014-02-07 11:33:49 +04:00
Ilya Lavrenov
412468e0ae added cv::sqrBoxFilter to T-API 2014-02-06 19:19:18 +04:00
Roman Donchenko
652a0bd5ce Merge pull request #2262 from SpecLad:merge-2.4 2014-02-03 15:33:41 +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
Andrey Pavlenko
82bab2b03b Merge pull request #2236 from ilya-lavrenov:tapi_boxfilter 2014-01-31 19:04:49 +04:00
Ilya Lavrenov
68f5dd4170 simplified cv::boxFilter OpenCL impl 2014-01-31 01:53:38 +04:00
Andrey Pavlenko
77bbd65fa6 Merge pull request #2220 from ilya-lavrenov:tapi_accumulate 2014-01-30 17:33:06 +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
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
Elena Gvozdeva
4d86804f11 Fixed merge conflicts 2014-01-23 15:31:32 +04:00
Elena Gvozdeva
b4652e2cb3 Added perf test for ocl_matchTemplate 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
86636dc265 Added ocl_matchTemplate( without dft) 2014-01-23 14:50:28 +04:00
Ilya Lavrenov
d2ffd8ed21 implemented OpenCL version of cv::preCornerDetect 2014-01-22 13:46:26 +04:00
Andrey Pavlenko
069bb9a929 Merge pull request #2185 from ilya-lavrenov:tapi_corners 2014-01-22 10:25:41 +04:00
Andrey Pavlenko
99942e8043 Merge pull request #2166 from ilya-lavrenov:tapi_gftt 2014-01-21 22:29:41 +04:00
Ilya Lavrenov
3177a683e9 ported corners to T-API 2014-01-21 20:13:55 +04:00
Ilya Lavrenov
bfa382cf9d fixed copying UMat -> std::vector 2014-01-21 14:37:22 +04:00
Ilya Lavrenov
e5130cf83f enabled tests 2014-01-20 18:09:43 +04:00
Ilya Lavrenov
52ed6d0d27 ported cv::goodFeaturesToTrack to T-API 2014-01-20 13:57:53 +04:00
Ilya Lavrenov
37789f015a deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
Roman Donchenko
79fcc06a4b Merge pull request #2146 from SpecLad:merge-2.4 2014-01-17 16:28:30 +04:00
Ilya Lavrenov
93a818684c ported cv::Canny to T-API 2014-01-17 11:13:28 +04:00
Seunghoon Park
2272a58769 fixing bug #3345. don't use BORDER_ISOLATED alone. it should be combined with some border type 2014-01-14 20:47:23 -05:00
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
6b9ebcbf3d deleted extra semicolons 2014-01-07 02:52:30 +04:00
Seunghoon Park
b036fc756a fixing bug #3345 2013-12-30 21:10:06 -05:00
Andrey Pavlenko
0913dd7ffa Merge pull request #2055 from vbystricky:ocl_sepFilter2D 2013-12-27 22:38:08 +04:00
vbystricky
26d53c7435 Change threshold from 2.0 to 1.0 in the test 2013-12-27 16:26:34 +04:00
vbystricky
b719ed79c2 Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR 2013-12-27 16:21:32 +04:00
Andrey Pavlenko
5c25d821b1 Merge pull request #2063 from vpisarev:ocl_moments 2013-12-27 15:44:12 +04:00
Vadim Pisarevsky
e97dd57dc7 hopefully fixed test failures and complains from the doc builder 2013-12-26 22:00:29 +04:00
Andrey Pavlenko
4644a864a5 Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject 2013-12-26 20:37:34 +04:00
Ilya Lavrenov
b23edc34e9 added cv::calcBackProject for 2-dimensional histograms 2013-12-26 19:17:32 +04:00
Ilya Lavrenov
d64bea00b2 ported cv::calcBackProject to T-API 2013-12-26 14:58:50 +04:00
Vadim Pisarevsky
a760c454dd tuned the speed for OpenCL-based moments (still slower than the single-thread SSE2 CPU code :( ) 2013-12-26 13:25:00 +04:00
Konstantin Matskevich
f55c85fed3 morphology 2013-12-26 09:55:17 +04:00
Vadim Pisarevsky
83f749afd2 moments work now and work more or less fast 2013-12-26 02:57:08 +04:00
Vadim Pisarevsky
6035925f41 experimental moments implementation (does not work yet) 2013-12-25 21:09:23 +04:00
vbystricky
35dc26e0b9 Add ocl implementation of the sepFilter2D into img_proc module. 2013-12-25 16:48:32 +04:00