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

86 Commits

Author SHA1 Message Date
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
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
Ilya Lavrenov 9b31e6cd44 changes according to reviewer's suggestions 2014-03-11 15:40:31 +04:00
Ilya Lavrenov c7857e8c13 small fixes 2014-02-21 12:19:08 +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 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 891dbeabba implemented OpenCL version of cv::fastNlMeansDenoising 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
Volodymyr Kysenko 89dd828e3c added test for correct handling of uniforma areas in the MergeMertens 2014-01-09 14:10:00 -08:00
Ilya Lavrenov 926cab2baa fixed warnings 2013-12-06 15:20:29 +04:00
siddharth 33e6c07485 Removed build errors and removed test images
Removed conflict

Error fix 1

Error fix 2

Error fix 3

Error fix 3

Error fix 4

Error fix 5

Error fix 6

Error fix 7

Error fix 8

Error fix 9

Error fix 10

Error fix 11

Error fix 12

Errors fixed

Removed opencv_extra folder inside opencv folder
2013-12-04 19:18:00 +05:30
siddharth f85a615f3f whitespaces removed and other minor changes to fix build error
Update 1

update 2

Update 3

Update 4

Update 5

update 6

Update 7

Update 8

Update 9

Update 10

Update 11

Update 12

Update 13

Update 14

Update 15

Update 16

Update 17

Update 18

Update 19

Update 20

Update 21

Update 22

Removed Headers

Update 23

Update 24

Update 25

Update 26

Update 27

Update 28
2013-12-04 19:17:59 +05:30
siddharth 56ab1c18e6 new filters added and all the 3 modules updated
All 3 modules Updated
2013-12-04 19:17:58 +05:30
siddharth 1ed0e44090 added keyboard control 2013-12-04 19:17:58 +05:30
siddharth e170115ad0 new interface added. decolor and cloning module added.
Both modules added
2013-12-04 19:17:58 +05:30
siddharth a1b3ba02a7 add color_boost + doc 2013-12-04 19:17:58 +05:30
siddharth 88aa4a9902 decolor module updated
update3

update4

update4

update5

added test data
2013-12-04 19:17:58 +05:30
Vadim Pisarevsky d0b3c7a518 added some diagnostic into Tonemap test 2013-11-18 23:14:44 -05:00
Anatoly Baksheev e154bce259 fixed compilation for vs2008 2013-11-17 14:13:13 +04:00
Roman Donchenko 1ac1b9ae35 Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
Fedor Morozov c9ace38897 Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
Fedor Morozov f99be6bda6 Mergin itseez 2013-09-18 18:55:12 +04:00
Fedor Morozov 90b6af1496 Merge new changes 2013-09-18 18:21:45 +04:00
Fedor Morozov 89508bf7ab NO exr now 2013-09-17 00:46:15 +04:00
Fedor Morozov 76c6fa9348 No EXR in tests 2013-09-17 00:39:22 +04:00
Fedor Morozov c118f3c529 Robertson update 2013-09-06 17:30:43 +04:00
Fedor Morozov e33a4f79f8 Merge branch 'devel' of https://github.com/f-morozov/opencv into devel 2013-09-05 14:49:18 +04:00
Fedor Morozov 85eb52b8af Debevec Calibrate 2013-09-05 14:41:35 +04:00
fm cb27740de4 Linux compilation 2013-09-05 14:26:21 +04:00
Fedor Morozov 0f703b8162 Calibrate Debevec changes 2013-09-05 14:10:53 +04:00
Alexander Shishkov 924f7ce373 small changes for compilation 2013-09-03 14:05:14 +04:00
Fedor Morozov e15eabe3fa Ghostbusters 2013-09-02 16:03:10 +04:00
Vladislav Vinogradov fd88654b45 replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov 3c34b24f1f replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov a0ae602bb7 renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov dcd600cc47 renamed gpuarithm -> cudaarithm 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov e895b7455e renamed gpu namespace -> cuda 2013-09-02 14:00:41 +04:00
Fedor Morozov 9f9873017c HDR test changes 2013-08-28 02:17:49 +04:00
Roman Donchenko beada19ad0 Merge pull request #1297 from SpecLad:merge-2.4 2013-08-20 14:10:22 +04:00
Roman Donchenko f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Vladislav Vinogradov 9f33de7071 added cvconfig.hpp header file to gpu tests
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
2013-08-19 12:46:57 +04:00
Roman Donchenko d9f71b762f Deleted almost all of the precomp.cpp files.
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
Fedor Morozov bef8d8192e Minor fixes, new MergeDebevec 2013-08-06 15:24:01 +04:00
Fedor Morozov 4c0f7f9e59 Tonemapping documentation update 2013-08-05 20:35:48 +04:00