fixed multi GPU API, added driver_api prefix to multi gpu samples

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index bb152c3..173e45d 100644 (file)
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -138,6 +138,7 @@ namespace cv
         {\r
         public:\r
             MultiGpuMgr();\r
+            ~MultiGpuMgr();\r
 \r
             // Makes the given GPU active\r
             void gpuOn(int gpu_id);\r
@@ -148,8 +149,10 @@ namespace cv
             static const int BAD_GPU_ID = -1;\r
 \r
         private:\r
-            class Impl;\r
+            void operator=(const MultiGpuMgr&);\r
+            MultiGpuMgr(const MultiGpuMgr&);\r
 \r
+            class Impl;\r
             Ptr<Impl> impl_;\r
         };\r
 \r

diff --git a/modules/gpu/src/multi_gpu_mgr.cpp b/modules/gpu/src/multi_gpu_mgr.cpp
index 51fc5c4..c435073 100644 (file)
--- a/modules/gpu/src/multi_gpu_mgr.cpp
+++ b/modules/gpu/src/multi_gpu_mgr.cpp
@@ -117,6 +117,7 @@ MultiGpuMgr::Impl::Impl(): num_devices_(0)
 
 
 MultiGpuMgr::MultiGpuMgr(): impl_(new Impl()) {}
+MultiGpuMgr::~MultiGpuMgr() {}
 
 
 void MultiGpuMgr::gpuOn(int gpu_id)

diff --git a/samples/gpu/multi.cpp b/samples/gpu/driver_api_multi.cpp
similarity index 100%
rename from samples/gpu/multi.cpp
rename to samples/gpu/driver_api_multi.cpp

diff --git a/samples/gpu/stereo_multi.cpp b/samples/gpu/driver_api_stereo_multi.cpp
similarity index 100%
rename from samples/gpu/stereo_multi.cpp
rename to samples/gpu/driver_api_stereo_multi.cpp