diff --git a/samples/gpu/performance/performance.cpp b/samples/gpu/performance/performance.cpp index 886c5e2f2d..1b5a0bf8c5 100644 --- a/samples/gpu/performance/performance.cpp +++ b/samples/gpu/performance/performance.cpp @@ -4,20 +4,9 @@ using namespace std; using namespace cv; - -void Test::gen(Mat& mat, int rows, int cols, int type, Scalar low, Scalar high) -{ - mat.create(rows, cols, type); - - RNG rng(0); - rng.fill(mat, RNG::UNIFORM, low, high); -} - - void Test::gen(Mat& mat, int rows, int cols, int type) { mat.create(rows, cols, type); - Mat mat8u(rows, cols * mat.elemSize(), CV_8U, mat.data, mat.step); RNG rng(0); @@ -35,7 +24,6 @@ void TestSystem::run() vector::iterator it = tests_.begin(); for (; it != tests_.end(); ++it) { - can_flush_ = false; Test* test = *it; cout << endl << test->name() << ":\n"; @@ -82,6 +70,7 @@ void TestSystem::flush() description_.str(""); cout << resetiosflags(ios_base::fixed | ios_base::left) << endl; + can_flush_ = false; } diff --git a/samples/gpu/performance/performance.h b/samples/gpu/performance/performance.h index ef0787cf8b..354c54e411 100644 --- a/samples/gpu/performance/performance.h +++ b/samples/gpu/performance/performance.h @@ -1,3 +1,6 @@ +#ifndef OPENCV_GPU_SAMPLE_PERFORMANCE_H_ +#define OPENCV_GPU_SAMPLE_PERFORMANCE_H_ + #include #include #include @@ -7,13 +10,10 @@ class Test { public: - Test(const std::string& name): name_(name) {} + explicit Test(const std::string& name): name_(name) {} const std::string& name() const { return name_; } - void gen(cv::Mat& mat, int rows, int cols, int type, - cv::Scalar low, cv::Scalar high); - void gen(cv::Mat& mat, int rows, int cols, int type); virtual void run() = 0; @@ -96,4 +96,6 @@ private: #define CPU_OFF TestSystem::instance()->cpuOff() #define GPU_OFF TestSystem::instance()->gpuOff() #define SUBTEST TestSystem::instance()->subtest() -#define DESCRIPTION TestSystem::instance()->subtest() \ No newline at end of file +#define DESCRIPTION TestSystem::instance()->subtest() + +#endif // OPENCV_GPU_SAMPLE_PERFORMANCE_H_ \ No newline at end of file