12 Commits

Author	SHA1	Message	Date
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	8c41c614eb	Merge pull request #700 from cuda-geek/fix_build_with_cuda ... fix master build with CUDA after latest 2.4 merge	2013-03-25 03:27:31 -07:00
marina.kolpakova	84f45e1e03	fixed build with CUDA after latest merge	2013-03-25 08:08:36 +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	75513a46dc	Remove all include directives for <string>	2013-03-22 22:14:47 +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	1ca8f33b4e	Merge branch '2.4'	2013-03-21 23:11:54 +04:00
Vladislav Vinogradov	0a65f2f4af	merged gpunonfree and nonfree module	2013-03-18 16:14:37 +04:00
Vladislav Vinogradov	abc9ef6809	moved utility functions from gpu_perf_test and gpu_test to ts module	2013-03-18 14:06:19 +04:00
Vladislav Vinogradov	7a0d6f7733	Super Resolution module	2013-02-27 13:41:15 +04:00