fixed bug in performance test matrix generation

diff --git a/samples/gpu/performance/performance.cpp b/samples/gpu/performance/performance.cpp
index 668b733..1da6330 100644 (file)
--- a/samples/gpu/performance/performance.cpp
+++ b/samples/gpu/performance/performance.cpp
@@ -4,22 +4,12 @@
 using namespace std;\r
 using namespace cv;\r
 \r
-void Test::gen(Mat& mat, int rows, int cols, int type)\r
-{   \r
-    mat.create(rows, cols, type);\r
-    Mat mat8u(rows, cols * mat.elemSize(), CV_8U, mat.data, mat.step);\r
-\r
-    RNG rng(0);\r
-    rng.fill(mat, RNG::UNIFORM, Scalar(0), Scalar(256));\r
-}\r
-\r
-\r
-void Test::gen(Mat& mat, int rows, int cols, int type, double low, double high)\r
+void Test::gen(Mat& mat, int rows, int cols, int type, Scalar low, Scalar high)\r
 {\r
     mat.create(rows, cols, type);\r
 \r
     RNG rng(0);\r
-    rng.fill(mat, RNG::UNIFORM, Scalar::all(low), Scalar::all(high));\r
+    rng.fill(mat, RNG::UNIFORM, low, high);\r
 }\r
 \r
 \r

diff --git a/samples/gpu/performance/performance.h b/samples/gpu/performance/performance.h
index 9fbb1f6..cecec45 100644 (file)
--- a/samples/gpu/performance/performance.h
+++ b/samples/gpu/performance/performance.h
@@ -14,8 +14,8 @@ public:
 \r
     const std::string& name() const { return name_; }\r
 \r
-    void gen(cv::Mat& mat, int rows, int cols, int type);\r
-    void gen(cv::Mat& mat, int rows, int cols, int type, double low, double high);\r
+    void gen(cv::Mat& mat, int rows, int cols, int type, \r
+             cv::Scalar low, cv::Scalar high);\r
 \r
     virtual void run() = 0;\r
 \r

diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp
index f9de6d8..8aa3bdc 100644 (file)
--- a/samples/gpu/performance/tests.cpp
+++ b/samples/gpu/performance/tests.cpp
@@ -1,4 +1,5 @@
 #include <opencv2/imgproc/imgproc.hpp>\r
+#include <opencv2/highgui/highgui.hpp>\r
 #include <opencv2/gpu/gpu.hpp>\r
 #include "performance.h"\r
 \r
@@ -8,7 +9,7 @@ using namespace cv;
 TEST(matchTemplate)\r
 {\r
     Mat image, templ, result;\r
-    gen(image, 3000, 3000, CV_32F);\r
+    gen(image, 3000, 3000, CV_32F, 0, 1);\r
 \r
     gpu::GpuMat d_image(image), d_templ, d_result;\r
 \r
@@ -16,7 +17,7 @@ TEST(matchTemplate)
     {\r
         SUBTEST << "img " << image.rows << ", templ " << templ_size << ", 32F, CCORR";\r
 \r
-        gen(templ, templ_size, templ_size, CV_32F);\r
+        gen(templ, templ_size, templ_size, CV_32F, 0, 1);\r
 \r
         CPU_ON;\r
         matchTemplate(image, templ, result, CV_TM_CCORR);\r
@@ -43,7 +44,7 @@ TEST(minMaxLoc)
     {\r
         SUBTEST << "img " << size << ", 32F, no mask";\r
 \r
-        gen(src, size, size, CV_32F);\r
+        gen(src, size, size, CV_32F, 0, 1);\r
 \r
         CPU_ON;\r
         minMaxLoc(src, &min_val, &max_val, &min_loc, &max_loc);\r
@@ -67,9 +68,9 @@ TEST(remap)
     {\r
         SUBTEST << "img " << size << " and 8UC1, 32FC1 maps";\r
 \r
-        gen(src, size, size, CV_8UC1);\r
-        gen(xmap, size, size, CV_32FC1, 0, size);\r
-        gen(ymap, size, size, CV_32FC1, 0, size);\r
+        gen(src, size, size, CV_8UC1, 0, 256);\r
+        gen(xmap, size, size, CV_32F, 0, size);\r
+        gen(ymap, size, size, CV_32F, 0, size);\r
 \r
         CPU_ON;\r
         remap(src, dst, xmap, ymap, INTER_LINEAR);\r
@@ -91,11 +92,11 @@ TEST(dft)
     Mat src, dst;\r
     gpu::GpuMat d_src, d_dst;\r
 \r
-    for (int size = 1000; size <= 4000; size += 1000)\r
+    for (int size = 1000; size <= 4000; size *= 2)\r
     {\r
         SUBTEST << "size " << size << ", 32FC2, complex-to-complex";\r
 \r
-        gen(src, size, size, CV_32FC2);\r
+        gen(src, size, size, CV_32FC2, Scalar::all(0), Scalar::all(1));\r
 \r
         CPU_ON;\r
         dft(src, dst);\r
@@ -119,7 +120,7 @@ TEST(cornerHarris)
     {\r
         SUBTEST << "size " << size << ", 32FC1";\r
 \r
-        gen(src, size, size, CV_32FC1);\r
+        gen(src, size, size, CV_32F, 0, 1);\r
 \r
         CPU_ON;\r
         cornerHarris(src, dst, 5, 7, 0.1, BORDER_REFLECT101);\r