From: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
Date: Wed, 3 Jul 2013 18:21:10 +0000 (+0400)
Subject: fixed warnings in gpu modules from VS 2012
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1014^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4d95b1406577da1ba42909bfa7d26e6b2a711dd;p=profile%2Fivi%2Fopencv.git

fixed warnings in gpu modules from VS 2012
---

diff --git a/modules/gpuarithm/test/test_precomp.hpp b/modules/gpuarithm/test/test_precomp.hpp
index f9d3ad4..d25aa0c 100644
--- a/modules/gpuarithm/test/test_precomp.hpp
+++ b/modules/gpuarithm/test/test_precomp.hpp
@@ -51,6 +51,8 @@
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
+#include <functional>
+
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_test.hpp"
 
diff --git a/modules/gpustereo/src/stereobm.cpp b/modules/gpustereo/src/stereobm.cpp
index 9b32cf7..30773a6 100644
--- a/modules/gpustereo/src/stereobm.cpp
+++ b/modules/gpustereo/src/stereobm.cpp
@@ -98,8 +98,8 @@ namespace
         int getPreFilterCap() const { return preFilterCap_; }
         void setPreFilterCap(int preFilterCap) { preFilterCap_ = preFilterCap; }
 
-        int getTextureThreshold() const { return avergeTexThreshold_; }
-        void setTextureThreshold(int textureThreshold) { avergeTexThreshold_ = textureThreshold; }
+        int getTextureThreshold() const { return static_cast<int>(avergeTexThreshold_); }
+        void setTextureThreshold(int textureThreshold) { avergeTexThreshold_ = static_cast<float>(textureThreshold); }
 
         int getUniquenessRatio() const { return 0; }
         void setUniquenessRatio(int /*uniquenessRatio*/) {}