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

This commit is contained in:
Andrey Pavlenko 2013-07-11 09:41:45 +04:00 committed by OpenCV Buildbot
commit decd0c753a
2 changed files with 4 additions and 2 deletions

View File

@ -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"

View File

@ -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*/) {}