12 Commits

Author	SHA1	Message	Date
Vladislav Vinogradov	3eeaa9189c	Revert "Revert "Merge pull request #836 from jet47:gpu-modules""	2013-06-07 13:05:39 +04:00
Vladislav Vinogradov	49a4f27d42	removed VIBE implementation	2013-05-17 11:27:00 +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	12f16b7a26	nonfree module fixes	2013-04-18 12:36:11 +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
marina.kolpakova	84f45e1e03	fixed build with CUDA after latest merge	2013-03-25 08:08:36 +04:00
Andrey Kamaev	2c9f651230	Merge pull request #688 from jet47:fix-nonfree-compilation	2013-03-22 17:18:40 +04:00
Vladislav Vinogradov	f0b19d4659	updated license header in whole gpu module	2013-03-22 14:03:15 +04:00
Vladislav Vinogradov	3ef2e1136f	fixed nonfree compilation with gpu (perf tests)	2013-03-22 10:20:57 +04:00
Vladislav Vinogradov	0149969463	disable tests that requires video support if it is not available	2013-03-21 13:40:07 +04:00
Vladislav Vinogradov	0a65f2f4af	merged gpunonfree and nonfree module	2013-03-18 16:14:37 +04:00