fixed ~200 warnings for windows

minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
parent 8f4d63913a
commit 84db4eb6fa
29 changed files with 126 additions and 66 deletions
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -1664,7 +1664,7 @@ private:
    GpuMat pattern_;

    std::vector<GpuMat> imagePyr_;
-    std::vector<GpuMat> maskPyr_;
+	cv::Ptr<std::vector<GpuMat>> maskPyr_;

    GpuMat buf_;