Merge pull request opencv#1082 from jet47:gpu-warnings-fix

AaronPlay · Jul 11, 2013 · decd0c7 · decd0c7
2 parents 68a992b + b4d95b1
commit decd0c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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*/) {}