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
parent fba72cb60d
commit 416fb50594
472 changed files with 22945 additions and 29803 deletions
--- a/samples/gpu/cascadeclassifier_nvidia_api.cpp
+++ b/samples/gpu/cascadeclassifier_nvidia_api.cpp
@@ -8,11 +8,10 @@
 #include <cstdio>
 #include "opencv2/gpu/gpu.hpp"
 #include "opencv2/highgui/highgui.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
 #include "opencv2/objdetect/objdetect_c.h"

 #ifdef HAVE_CUDA
-#include "opencv2/gpulegacy.hpp"
+#include "NCVHaarObjectDetection.hpp"
 #endif

 using namespace std;