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
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	033dd77504	superres module fixes	2013-04-18 12:36:11 +04:00
Andrey Kamaev	5e048d1fa5	Move C API of opencv_objdetect to separate file ... Also move cv::linemod to own header	2013-04-12 14:37:01 +04:00
Vladislav Vinogradov	910ef57109	renamed cuda namespace to cudev	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
marina.kolpakova	84f45e1e03	fixed build with CUDA after latest merge	2013-03-25 08:08:36 +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	7a0d6f7733	Super Resolution module	2013-02-27 13:41:15 +04:00