renamed gpu headers (made it more consistent)

2013-05-30 11:23:18 +04:00
parent 6c253a41c2
commit 4c9773d55f
38 changed files with 61 additions and 54 deletions
--- a/modules/ts/src/ts_perf.cpp
+++ b/modules/ts/src/ts_perf.cpp
@@ -1,7 +1,7 @@
 #include "precomp.hpp"

 #ifdef HAVE_CUDA
-#include "opencv2/core/gpumat.hpp"
+#include "opencv2/core/gpu.hpp"
 #endif

 #ifdef ANDROID
@@ -72,10 +72,6 @@ static void setCurrentThreadAffinityMask(int mask)
 }
 #endif

-#ifdef HAVE_CUDA
-# include <opencv2/core/gpumat.hpp>
-#endif
-
 namespace {

 class PerfEnvironment: public ::testing::Environment