Commit Graph

79 Commits

Author SHA1 Message Date
Vladislav Vinogradov
8fcef225fb switched to Input/Output Array in reductions operations 2013-06-11 17:58:05 +04:00
Roman Donchenko
3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
2013-06-10 18:18:01 +04:00
Vladislav Vinogradov
3eeaa9189c Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
Vladislav Vinogradov
31a5f7ef3c fixed bug #3069 (infinite loop in GPU LBP Cascade detectMultiScale) 2013-06-05 14:08:55 +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
a6648b5372 gpuobjdetect module for object detection 2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
229ca0914a gpunvidia module for NCV & NPP API 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
54e7c76d99 fixed compilation errors 2013-04-17 15:24:53 +04:00
Vladislav Vinogradov
b50090f850 restore cudaSafeCall 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
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
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Vladislav Vinogradov
15f09f8068 fixed gpu module compilation 2013-03-28 11:48:43 +04:00
Andrey Kamaev
be7bbe3aa9 Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
Andrey Kamaev
2ad7b97f1c All modules (except ocl and gpu) compiles and pass tests 2013-03-22 22:14:26 +04:00
Vladislav Vinogradov
f0b19d4659 updated license header in whole gpu module 2013-03-22 14:03:15 +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
Vladislav Vinogradov
8b1f88c40f updated gpu module API 2013-02-21 16:12:33 +04:00
Andy Maloney
bc68dfb4e8 Remove unused vars 2013-02-01 18:09:58 -05: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
marina.kolpakova
e5437e5486 Fix binary compatibility of opencv_gpu 2012-10-17 02:09:40 +04:00
Anatoly Baksheev
4b5bbb7752 fast_nlm initial version 2012-10-08 19:57:19 +04:00
Anatoly Baksheev
55b1d7c097 added CUDA_DISABLER preprocessor commands 2012-10-01 23:57:38 +04:00
Anatoly Baksheev
70204a8e68 Removed PtrElemStep, Marked DevMem1D as deprecated, now should use PtrStepSz now 2012-08-24 02:02:42 +04:00
Anatoly Baksheev
290030d030 possibility to enable /mp compiler flag from cmake
fixed MCVC warnings
2012-08-23 16:53:53 +04:00
marina.kolpakova
9c13b84e35 fixed unused warnings 2012-08-20 00:06:12 +04:00
marina.kolpakova
8d73bbb8b7 fixed 2228 2012-08-02 13:18:55 +04:00
marina.kolpakova
1b7ad93dc9 LBP features integrated in CascadeClassifier_GPU 2012-07-24 13:51:35 +04:00
marina.kolpakova
2dc93574e1 LBP: switched to PImpl pattern 2012-07-24 13:41:19 +04:00
marina.kolpakova
6c3eeb7d7c removed division 2012-07-24 13:35:04 +04:00
marina.kolpakova
8fb1f4093b removed unused code 2012-07-24 13:26:53 +04:00
Marina Kolpakova
e63ab8dec5 LBP: multiscale approach; refactored atomics usage 2012-07-17 08:27:34 +00:00
Marina Kolpakova
336dcbcff7 fixed brocken tests by classifier loger from r9027 2012-07-15 04:11:46 +00:00
Anatoly Baksheev
a2430afcac minor LBP for GPU 2012-07-14 16:23:56 +00:00
Marina Kolpakova
b9e53ec8ea fixed build after r9027 2012-07-14 15:50:49 +00:00
Anatoly Baksheev
bfe6e2c4b1 minor in LBP for GPU 2012-07-14 15:36:25 +00:00
Anatoly Baksheev
9706079ace a bit refactoring in LBP face detection on GPU 2012-07-13 15:47:09 +00:00
Marina Kolpakova
58c67ccfea improved LBP indexing 2012-07-12 08:50:41 +00:00
Marina Kolpakova
965109228d added delobal memory version 2012-07-12 08:50:36 +00:00
Marina Kolpakova
2aacff4c39 swithed to the fixed size thread block 2012-07-12 07:11:26 +00:00
Marina Kolpakova
3c2691ef96 LBP: minor changes 2012-07-11 12:22:28 +00:00
Marina Kolpakova
ed1b293d34 refactored GPU LBP cascade. Added support for big images. Fixed bug in connected components function 2012-07-11 12:22:22 +00:00
Marina Kolpakova
86d785622b LBP: switched to texture implementation 2012-07-10 11:58:15 +00:00
Marina Kolpakova
bc83011736 removed unnecessary memory allocation in LBP classifier 2012-07-04 16:03:48 +00:00
Marina Kolpakova
e496345d33 added lbp cascade test, fixed race conditions problems 2012-07-04 12:11:16 +00:00
Marina Kolpakova
248f39e13e added performance test for LBP classifier. 2012-07-04 12:11:07 +00:00
Marina Kolpakova
4128d5782f added hipotesis filtration 2012-07-04 04:51:09 +00:00