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

214 Commits

Author SHA1 Message Date
Vadim Pisarevsky 95a4943762 Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements 2014-08-14 13:39:01 +00:00
Vadim Pisarevsky 9a5aa4b23c trying to solve compile problems; temporarily disabled some tests for just added optimization algo's 2014-08-14 14:37:30 +04:00
Vadim Pisarevsky 4530c7ad08 trying to fix builds 2014-08-14 13:18:04 +04:00
Vadim Pisarevsky 257463719b removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API 2014-08-14 12:50:07 +04:00
Alexander Karsakov 75ede6e17c Minimal image size is set to 5*5 for OCL path of fastNlMeansDenoising and fastNlMeansDenoisingColored since it breaks tests with test_loop_times=30 and in general doesn't make sense for computation on GPU. 2014-08-14 12:14:33 +04:00
Alexander Alekhin 55188fe991 world fix 2014-08-05 20:12:35 +04:00
Vadim Pisarevsky 05164bf713 Merge pull request #2608 from Siddharthk:master 2014-08-01 09:13:32 +00:00
siddharth 4cdc155eac test 2014-07-29 00:15:11 +05:30
siddharth 0972a2d758 Fixed mixed cloning bug 2014-07-29 00:15:11 +05:30
siddharth 88d05a89d4 removed build error
Whitespaces removed
2014-07-29 00:15:11 +05:30
siddharth 1a14d8506d recursive filter output corrected 2014-07-29 00:15:11 +05:30
siddharth 14631be59f Updated Documentation 2014-07-29 00:15:11 +05:30
András Kovács d1c7983fe5 calibrateDebevec index fix (issue 3664) 2014-07-21 17:27:03 +02:00
vbystricky 4286f60387 Extract imgcodecs module from highgui 2014-07-07 16:28:08 +04:00
Ilya Lavrenov 4a63b3dd90 cv2cvtest part2 2014-04-09 13:08:51 +04:00
Ilya Lavrenov 2cd51c04e4 fixed condition in cv::FNLM 2014-04-01 23:18:07 +04:00
Roman Donchenko da7a605224 Merge pull request #2123 from white-pony:vkysenko/fix-mertens 2014-03-25 14:37:56 +04:00
Andrey Pavlenko 2299e2ed1b Merge pull request #2494 from ilya-lavrenov:tapi_merge 2014-03-20 13:39:39 +04:00
Ilya Lavrenov b73490f86c eliminated restriction src[i].channels() == 1 in cv::merge 2014-03-19 13:56:31 +04:00
Ilya Lavrenov 6fe71bd27c added 4 channels support to fnlm 2014-03-18 14:29:02 +04:00
Andrey Pavlenko 6b6cfa893d Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans 2014-03-13 16:48:38 +04:00
Ilya Lavrenov 9b31e6cd44 changes according to reviewer's suggestions 2014-03-11 15:40:31 +04:00
Roman Donchenko 5527f2872d Merge pull request #2409 from juanmanpr:master 2014-03-04 15:32:13 +04:00
Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Ilya Lavrenov eedf86402d typos 2014-03-02 21:04:17 +04:00
juanmanpr 7a68e3d207 CV_Assert for photo module corrected 2014-02-25 19:58:08 +01: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
juanmanpr 540a60fca7 Replaced calls to cout from photo module, by CV_Assert 2014-02-25 00:29:07 +01:00
Ilya Lavrenov c7857e8c13 small fixes 2014-02-21 12:19:08 +04:00
Andrey Pavlenko 9c5bd85247 Merge pull request #2375 from akarsakov:fix_getGradient 2014-02-20 21:41:43 +04:00
Alexander Karsakov 7e4dea968c Fixed typo with indexes in getGradient(x/y) functions. 2014-02-20 13:58:31 +04:00
Ilya Lavrenov 8bf616e4c7 added color image support via L*a*b* 2014-02-19 18:35:37 +04:00
Ilya Lavrenov 634e8d37cc fixed for 2 channels 2014-02-19 18:18:22 +04:00
Ilya Lavrenov 7faf1f6277 some improvements 2014-02-19 15:01:34 +04:00
Ilya Lavrenov 72c327fef8 hope it finally works 2014-02-18 19:23:38 +04:00
Ilya Lavrenov 38cbe9873a small fixes 2014-02-18 14:56:13 +04:00
Ilya Lavrenov 9db28f332a more fixes 2014-02-18 14:32:03 +04:00
Ilya Lavrenov 891dbeabba implemented OpenCL version of cv::fastNlMeansDenoising 2014-02-18 14:32:03 +04:00
Ilya Lavrenov d27068f79a some more refactoring 2014-02-18 14:32:03 +04:00
Ilya Lavrenov e16d89e8d6 some refactoring 2014-02-18 14:32:03 +04:00
Roman Donchenko 029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
Ilya Lavrenov 4f2cdc9bac added performance tests for NLMeans 2014-02-11 18:21:53 +04:00
Ilya Lavrenov 37789f015a deleted excess semicolons, commas 2014-01-18 01:31:33 +04:00
Volodymyr Kysenko 89dd828e3c added test for correct handling of uniforma areas in the MergeMertens 2014-01-09 14:10:00 -08:00
Volodymyr Kysenko aa36898024 added epsilon value to weights in the MergeMertens in order to avoid zero weights for pixels from uniformly filled areas of image 2014-01-07 19:38:57 -08:00
Ilya Lavrenov 73aa43d2ca fixed warnings 2013-12-07 01:05:07 +04:00
Ilya Lavrenov 926cab2baa fixed warnings 2013-12-06 15:20:29 +04:00
siddharth c48ad880f3 Errors resolved 2013-12-04 19:18:00 +05:30
Anna Kogan 944f7bac42 After-merge corrections 2013-12-04 19:18:00 +05:30
siddharth 573e818415 New changes done and removed opencv_extra folder
Removed opencv_extra folder inside opencv folder

New changes done

Removed test images
2013-12-04 19:18:00 +05:30