Commit Graph

215 Commits

Author SHA1 Message Date
Fedor Morozov
e15eabe3fa Ghostbusters 2013-09-02 16:03:10 +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
cfe4a71dc6 renamed gpu* source to cuda* in core module 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
8282f6ebc1 renamed gpu::cudev namespace -> cuda::device
cudev is used for new device layer
2013-09-02 14:00:41 +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
2c4bbb313c Merge commit '43aec5ad' into merge-2.4
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Fedor Morozov
833f8d16fa Robertson and tutorial 2013-08-26 15:23:37 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +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
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
Fedor Morozov
cb999a231e Mantiuk's tonemapping 2013-08-05 19:31:10 +04:00
Fedor Morozov
17609b90c7 Mantiuk's tonemapping 2013-08-05 19:22:42 +04:00
Alexander Shishkov
6df203c449 Fixes for Linux compilation, small changes 2013-08-03 01:45:20 +04:00
Fedor Morozov
302bf23f82 All hdr functions as Algorithms 2013-08-01 03:24:47 +04:00
Fedor Morozov
4d2ea847fa Tonemap as 3.0 algorithm 2013-07-31 16:05:31 +04:00
Fedor Morozov
258b98d15b Tonemap as Algorithm 2013-07-29 21:35:10 +04:00
Fedor Morozov
af2c9077f7 Calibration, various changes 2013-07-21 13:56:20 +04:00
Fedor Morozov
703cf8cef7 Calibration, various changes 2013-07-21 13:48:57 +04:00
Alexander Shishkov
b87d2e9ec2 cosmetic change 2013-07-19 03:10:38 +04:00
Alexander Shishkov
919f35644e Merge branch 'master' of https://github.com/f-morozov/opencv 2013-07-19 01:08:49 +04:00
Alexander Shishkov
35a39c19a3 minor changes 2013-07-19 01:08:42 +04:00
Fedor Morozov
ec668ce3a7 Documentation 2013-07-19 00:23:49 +04:00
Alexander Shishkov
245dc99248 added include precomp 2013-07-18 01:13:35 +04:00
Alexander Shishkov
707048f6e1 removed tonemap_algorithms due to wrapping problems 2013-07-18 00:55:39 +04:00
Fedor Morozov
091b48de60 MTB alignment. Missing main file. 2013-07-12 16:08:06 +04:00
Fedor Morozov
35133df0de MTB alignment. Code, tests, application 2013-07-12 16:03:53 +04:00
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
Fedor Morozov
0aee5b61e3 Exposure fusion. Code, tests. 2013-07-05 16:14:08 +04:00
Fedor Morozov
a5e11079d7 Fixes, missing files, tests 2013-07-04 16:51:39 +04:00
Fedor Morozov
122f85f352 Tonemapping code 2013-06-28 16:25:12 +04:00
Fedor Morozov
84ea0c9a97 Tests and rgbe fix 2013-06-24 05:54:58 +04:00
Fedor Morozov
7469c935f3 HDR formats support and HDR making. Code only. 2013-06-23 14:19:09 +04:00
Vladislav Vinogradov
439c3574ed renamed gpu_private.hpp to private.gpu.hpp 2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
3eeaa9189c Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
Roman Donchenko
bae85660da Merge remote-tracking branch 'origin/2.4'
Pull requests:
	#943 from jet47:cuda-5.5-support
	#944 from jet47:cmake-2.8.11-cuda-fix
	#912 from SpecLad:contributing
	#934 from SpecLad:parallel-for
	#931 from jet47:gpu-test-fixes
	#932 from bitwangyaoyao:2.4_fixBFM
	#918 from bitwangyaoyao:2.4_samples
	#924 from pengx17:2.4_arithm_fix
	#925 from pengx17:2.4_canny_tmp_fix
	#927 from bitwangyaoyao:2.4_perf
	#930 from pengx17:2.4_haar_ext
	#928 from apavlenko:bugfix_3027
	#920 from asmorkalov:android_move
	#910 from pengx17:2.4_oclgfft
	#913 from janm399:2.4
	#916 from bitwangyaoyao:2.4_fixPyrLK
	#919 from abidrahmank:2.4
	#923 from pengx17:2.4_macfix

Conflicts:
	modules/calib3d/src/stereobm.cpp
	modules/features2d/src/detectors.cpp
	modules/gpu/src/error.cpp
	modules/gpu/src/precomp.hpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/morph.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/pyrlk.cpp
	modules/video/src/bgfg_gaussmix2.cpp
	modules/video/src/lkpyramid.cpp
	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
	platforms/scripts/ABI_compat_generator.py
	samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
Roman Donchenko
29b13ec1de Replaced most of the usages of parallel_for with that of parallel_for_.
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
Andrey Kamaev
416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules"
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
f375c86dfb photo module fixes 2013-04-18 12:36:11 +04:00
Vladislav Vinogradov
43d5e2d8b4 removed gpu BORDER_* constants 2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
e72ba73e70 moved gpu nlm to photo module 2013-04-18 11:33:33 +04:00
Andrey Kamaev
69648f0a6f Make photo.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2 Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
Andrey Kamaev
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
2a6fb2867e Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
7374445398 Fix integer overflow in NL-Means denoising on white input
Issues #2646
2013-01-28 14:35:51 +04:00
Andrey Kamaev
06e7101795 Add Tegra optimization for fastNlMeansDenoising 2012-09-28 18:56:36 +04:00
Andrey Kamaev
44e8d76d74 Change denoising strength parameter from int to float 2012-09-20 17:27:48 +04:00
Andrey Kamaev
f42b38ac44 Refactor fast NL-means denoising
* reorder arguments
* rewrite accuracy tests
* replace doubles with integer arithmetic inside the main loop
2012-09-19 16:50:56 +04:00
Andrey Kamaev
7e35838849 Minor refactoring of NL-means denoising 2012-09-17 17:19:00 +04:00
Vadim Pisarevsky
0bd68a70f1 fixed #2297, #2300; fixed several warnings 2012-08-28 13:45:35 +04:00
Leonid Beynenson
6a5d996ca8 Removed the header opencv2/photo/denoising.hpp
All the functions from it are moved to the header
opencv2/photo/photo.hpp
2012-08-22 17:51:52 +04:00
Vadim Pisarevsky
2f1cc018c9 enabled SSE3 by default; integrated SSE3-optimized bilateral filter (by Grigoriy Frolov); modified API of non-local means (use Input/OutputArrays) 2012-08-21 17:39:40 +04:00
Victor Passichenko
18de45f7bc Add CV_Asserts for channels count 2012-08-21 16:05:18 +04:00
Victor Passichenko
92edd4fc6e Fix building for MS VS C++: remove allocation of arrays of dynamic size in stack 2012-08-21 15:41:51 +04:00
Victor Passichenko
017ab51bf4 Fix wrong memory deallocation 2012-08-21 15:38:38 +04:00
Victor Passichenko
1f42de39a3 Add non-local means denoising algorithm implementatation into photo module 2012-08-19 13:13:58 +04:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
957e80abbd lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template. 2012-03-15 14:36:01 +00:00