Commit Graph

322 Commits

Author SHA1 Message Date
Vladislav Vinogradov
259ceb7eaa renamed gpufeatures2d -> cudafeatures2d 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
5660d6a680 renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
a0ae602bb7 renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
219b662127 renamed gpufilters -> cudafilters 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
71d61e07b1 renamed gpustereo -> cudastereo 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
d4901a99ea renamed gpuwarping -> cudawarping 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dcd600cc47 renamed gpuarithm -> cudaarithm 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
6d216d78d9 renamed gpulegacy -> cudalegacy 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dbeb3e2968 renamed gpucodec -> cudacodec 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
91dd44e7fa removed compatibility headers 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
5a85f1b6da renamed gpucodec namespace -> cudacodec 2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e895b7455e renamed gpu namespace -> cuda 2013-09-02 14:00:41 +04:00
Roman Donchenko
e59c74e1c7 Merge pull request #1348 from SpecLad:merge-2.4 2013-08-28 13:41:41 +04:00
Roman Donchenko
2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +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
Roman Donchenko
657699a1da Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5 2013-08-27 12:43:36 +04:00
Kirill Kornyakov
030fa5673e bugfix-for-3231 2013-08-23 12:34:35 +04:00
Changlin Hsieh
723ba29660 Update cmake files by using CUDA_CUDA_LIBRARIES 2013-08-23 16:05:35 +08:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +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
Jin Ma
8fb6b689c6 1. Added OpenCL version of superres to the sample.
2. Modified according to the feedback of the community.
2013-08-16 16:31:31 +08:00
Roman Donchenko
7992402ecf Merge pull request #1149 from jet47:generalized-hough-refactoring 2013-08-14 13:26:24 +04:00
Changlin Hsieh
c1dd38cbff Fix GPU example build failed with cuda 5.5 2013-08-14 16:16:03 +08:00
Vladislav Vinogradov
62edeeed16 refactored FGD algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
697793090d refactored GMG algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
b8f0d1a0e4 refactored MOG2 algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
a2adab7283 refactored MOG algorithm
converted it to abstract interface
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
7b87d72d80 refactored generalized hough (both CPU and GPU):
removed set/get methods from Algorithm (implement owns)
removed GHT_* enumeration
2013-07-18 15:17:33 +04:00
Vladislav Vinogradov
39a25115e0 fixed compilation 2013-07-17 11:41:48 +04:00
Vladislav Vinogradov
de56163f97 refactored gpu::matchTemplate (converted it into Algorithm) 2013-07-17 11:39:57 +04:00
Vladislav Vinogradov
70e6dc615a refactored GoodFeaturesToTrackDetector 2013-07-17 11:39:56 +04:00
Vladislav Vinogradov
d7ff3ad0cf refactored cornerHarris and cornerMinEigenVal
* converted it into Algorithm
2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
ad4d6bed9d refactored gpu::GeneralizedHough 2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
1652540a1f refactored HoughLines (converted it into Algorithm) 2013-07-17 11:39:54 +04:00
Vladislav Vinogradov
48fb8c4f8a refactored gpu::Canny (converted it into Algorithm) 2013-07-17 11:39:53 +04:00
Vladislav Vinogradov
fc8476544c switched to Input/Output Array in Histogram Processing 2013-07-17 11:39:52 +04:00
Vladislav Vinogradov
9eea9835ab switched to Input/Output Array in Color Processing 2013-07-17 11:39:52 +04:00
Vladislav Vinogradov
2932beddcf switched to Input/Output Array in gpuwarping functions 2013-07-12 08:12:48 +04:00
Vladislav Vinogradov
98bd401534 fix gpu::DeviceInfo compilation under linux
glibc defines major and minor macros
which conflict with  gpu::DeviceInfo methods with the same name
2013-06-24 10:11:44 +04:00
Roman Donchenko
eff6dccb3b Merge pull request #1014 from jet47:gpustereo-refactoring 2013-06-21 17:38:36 +04:00
Vladislav Vinogradov
be9bb8f18b refactored StereoConstantSpaceBP 2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
d0e89337da refactored StereoBeliefPropagation 2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
dd6d58f873 refactored StereoBM 2013-06-14 18:17:30 +04:00
Vladislav Vinogradov
5720eaf354 refactored Morphology Filters 2013-06-14 17:25:57 +04:00
Vladislav Vinogradov
12ae11e2ff refactored Separable Linear Filters 2013-06-14 17:25:56 +04:00
Vladislav Vinogradov
1eedc6c42a refactored Linear Filter 2013-06-14 17:25:56 +04:00
Roman Donchenko
71db862dc2 Merge pull request #977 from jet47:gpucodec-refactoring 2013-06-14 16:24:24 +04:00
Vladislav Vinogradov
8fcef225fb switched to Input/Output Array in reductions operations 2013-06-11 17:58:05 +04:00