Commit Graph

123 Commits

Author SHA1 Message Date
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
013581f371 fixed GPU module compialtion with CMake 2.8.11
CMake 2.8.11 removed linkage with CUDA driver library,
but it's used by gpu video encoding/decoding
2013-06-03 13:29:26 +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
ac0f506d0e split gpuvideo onto gpuoptflow and gpubgsegm 2013-04-18 11:33:34 +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
fc3730fcc2 gpuwarping module for image warping 2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
7e91e1871d simplify CMakeLists.txt for 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
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
2bad639aee fixed source_group 2013-04-08 17:25:16 +04:00
Vladislav Vinogradov
a57707b8d8 moved device layer to core module 2013-04-08 17:25:15 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Vladislav Vinogradov
870563ba25 fixed compilation warning for CUDA files
command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]
2013-04-03 13:47:59 +04:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Vladislav Vinogradov
4dbd0f0e8f fixed compilation issues with gpu modules:
* disabled warnings from thrust
* fixed warnings from ts_gtest.h
* possibly fixed superres compilation in Debug mode on Windows
2013-03-26 12:33:13 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Vladislav Vinogradov
fd7bf0b766 moved SURF_GPU and VIBE to gpunonfree module 2013-03-18 14:06:29 +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
Vladislav Vinogradov
2181a41a07 added perf4au app 2013-02-13 15:58:24 +04:00
Vladislav Vinogradov
395f0201e3 fixed build for CARMA:
- added CMake toolchain file
- added WITH_NVCUVID flag
2013-01-23 21:05:08 +04:00
Vladislav Vinogradov
ae6266e101 fixes for gpu module:
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Anatoly Baksheev
4b5bbb7752 fast_nlm initial version 2012-10-08 19:57:19 +04:00
Vladislav Vinogradov
ab3a5244ba moved device layer headers to include directory 2012-10-05 18:04:23 +04:00
Anatoly Baksheev
e60a50c43c removed /EHa flag for cuda compilation 2012-08-23 16:53:53 +04:00
Vladislav Vinogradov
a0aef244d6 removed perf_gpu_cpu from CMake scripts 2012-08-20 09:58:37 +04:00
Andrey Kamaev
15e50420bc Fixed linux and android install 2012-06-27 13:52:29 +00:00
Marina Kolpakova
b065c7a296 fixes for the newly added gcc warning keys 2012-06-21 03:48:36 +00:00
Marina Kolpakova
7dd0067792 suppress warning no previous declaration for gpu module 2012-06-13 13:10:11 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Marina Kolpakova
e86f0aaea1 fixed hundreds of "anonymous" warnings for gpu module. 2012-06-08 17:09:38 +00:00
Vladislav Vinogradov
bfb390e82a added gpu::FGDStatModel (Background/foreground segmentation) 2012-06-05 13:32:04 +00:00
Anatoly Baksheev
32c7eeca78 arithm test gpu tests for cpu :) 2012-05-22 13:15:22 +00:00
Vladislav Vinogradov
1d57911646 updated gpu-vs-cpu performance tests 2012-05-22 10:29:58 +00:00
Vladislav Vinogradov
d78aa7c937 added cpu performance test for gpu module 2012-05-22 08:29:08 +00:00
Vladislav Vinogradov
2dafc9a853 fixed build under MacOS (disabled video decoding, it's not supported) 2012-05-11 11:48:15 +00:00
Vladislav Vinogradov
4ddde66b48 fixed build without ffmpeg (gpu module) 2012-04-24 14:15:38 +00:00
Vladislav Vinogradov
c2935a6532 fixed build of gpu module without CUDA (video encoding/decoding) 2012-04-24 07:49:55 +00:00
Vladislav Vinogradov
2bfaf540a1 added VideoWriter_GPU 2012-04-17 07:12:16 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00