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
#include <opencv2/imgproc/imgproc.hpp>\r
+#include <opencv2/highgui/highgui.hpp>\r
#include <opencv2/gpu/gpu.hpp>\r
#include "performance.h"\r
\r
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
{\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
{\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
{\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
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
{\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