From 5d4913a2eed8d551099279f352fb6c5ca60a7243 Mon Sep 17 00:00:00 2001
From: Alexey Spizhevoy <no@email>
Date: Tue, 15 Feb 2011 09:12:48 +0000
Subject: [PATCH] fixed multi GPU API, added driver_api prefix to multi gpu
 samples

---
 modules/gpu/include/opencv2/gpu/gpu.hpp                      | 5 ++++-
 modules/gpu/src/multi_gpu_mgr.cpp                            | 1 +
 samples/gpu/{multi.cpp => driver_api_multi.cpp}              | 0
 .../gpu/{stereo_multi.cpp => driver_api_stereo_multi.cpp}    | 0
 4 files changed, 5 insertions(+), 1 deletion(-)
 rename samples/gpu/{multi.cpp => driver_api_multi.cpp} (100%)
 rename samples/gpu/{stereo_multi.cpp => driver_api_stereo_multi.cpp} (100%)

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index bb152c31f7..173e45d814 100644
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -138,6 +138,7 @@ namespace cv
         {
         public:
             MultiGpuMgr();
+            ~MultiGpuMgr();
 
             // Makes the given GPU active
             void gpuOn(int gpu_id);
@@ -148,8 +149,10 @@ namespace cv
             static const int BAD_GPU_ID = -1;
 
         private:
-            class Impl;
+            void operator=(const MultiGpuMgr&);
+            MultiGpuMgr(const MultiGpuMgr&);
 
+            class Impl;
             Ptr<Impl> impl_;
         };
 
diff --git a/modules/gpu/src/multi_gpu_mgr.cpp b/modules/gpu/src/multi_gpu_mgr.cpp
index 51fc5c426c..c435073b07 100644
--- 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