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

976 Commits

Author SHA1 Message Date
Vladislav Vinogradov 14e4b3adde rewrite core/cuda/vec_math.hpp file
old version isn't compiled with CUDA 5.5
new version doesn't depend on functional.hpp
2013-06-07 16:32:43 +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
Vladislav Vinogradov bcf8bdb401 fixed constructors for functional objects (added __host__ modifier) 2013-06-03 14:41:23 +04:00
Vladislav Vinogradov 58e472754a fixed norm diff function (it uses pre-allocated buffer now) 2013-06-03 13:37:44 +04:00
Vladislav Vinogradov 0521e8908c fixed NPP error constants usage 2013-06-03 13:37:36 +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
Roman Donchenko dad58d8940 Fix a build error which manifests when building with CUDA < 5. 2013-05-23 14:00:13 +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 5d7bbdc837 gpu module fixes 2013-04-18 12:36:07 +04:00
Vladislav Vinogradov eda124ec32 removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov 28b1caa730 gpustereo module for stereo correspondence 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov cad9518928 moved image labeling to gpu module 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov 77aafc2984 removed unused includes 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov 623c7da747 removed obsolete source files from gpu module 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov a6648b5372 gpuobjdetect module for object detection 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov b08b9ab83b gpucalib3d module for camera calibration and stereo correspondence 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov fc1fa28556 gpuvideo module for video processing 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov 7544ddbfef gpufeatures2d module 2d for feature detection and matching 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov e41aea0acf gpuimgproc module for image processing 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov d569e72ad4 moved mulSpectrums, dft and convolve to gpuarithm 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov c56bdbc1c5 moved integral to gpuarithm module 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov 10ac854358 moved copyMakeBorder to gpuarithm module 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov d08ebfe4d3 moved rectStdDev to gpuarithm 2013-04-18 11:33:31 +04:00
Vladislav Vinogradov ed006a0612 added private header to gpunvidia module 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov c2402053b9 removed columnSum function (it is a duplicate for reduce) 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov 229ca0914a gpunvidia module for NCV & NPP API 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov 84de6ce036 gpufilters module for image filtering 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov 31c8b527c6 gpuarithm module for arithmetics operations on matrices 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov 1b00a3ed54 gpucodec module for video decoding/encoding 2013-04-18 11:33:29 +04:00
Vladislav Vinogradov 54e7c76d99 fixed compilation errors 2013-04-17 15:24:53 +04:00
Andrey Kamaev c98c246fc2 Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
Vladislav Vinogradov ba1a1aecaa fixed gpu module compilation 2013-04-09 10:41:35 +04:00
Vladislav Vinogradov b50090f850 restore cudaSafeCall 2013-04-08 17:25:16 +04:00
Vladislav Vinogradov d47e89d704 fixed windows build 2013-04-08 17:25:16 +04:00
Vladislav Vinogradov 910ef57109 renamed cuda namespace to cudev 2013-04-08 17:25:15 +04:00
Vladislav Vinogradov 1bb141c465 fixed build 2013-04-08 17:25:15 +04:00
Vladislav Vinogradov 193e857392 removed cu_safe_call.h and cu_safe_call.cpp 2013-04-08 17:25:15 +04:00
Vladislav Vinogradov 204a19b431 moved common gpu utility functionality to gpu_private.hpp 2013-04-08 17:25:15 +04:00
Vladislav Vinogradov 28b1e81883 renamed device -> cuda 2013-04-08 17:25:15 +04:00
Vladislav Vinogradov a57707b8d8 moved device layer to core module 2013-04-08 17:25:15 +04:00
Vladislav Vinogradov 8d97d9598e updated GPU version of TVL1 2013-04-08 15:18:26 +04:00
Andrey Kamaev 67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Andrey Kamaev 78c70ab948 Merge pull request #747 from taka-no-me:split_c_cpp 2013-04-04 00:55:22 +04:00
Vladislav Vinogradov 366f859ada fixed compilation after CV_IMPLEMENT_QSORT_EX removing 2013-04-03 12:59:40 +04:00
Andrey Kamaev 517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Vladislav Vinogradov 8e10cd8946 fixed gpu module compilation under windows 2013-04-01 14:15:06 +04:00
Andrey Kamaev f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Vladislav Vinogradov 924b0ef786 fixed bug in TVL1 optical flow:
initial optical flow was not cleaned during the second call
2013-03-29 10:40:28 +04:00
Vladislav Vinogradov 76e748ccc1 removed internal_header.hpp - it produces many warnings 2013-03-28 11:49:26 +04:00