testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4),\r
MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4),\r
MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4)),\r
- testing::Values(Interpolation(cv::INTER_NEAREST), Interpolation(cv::INTER_LINEAR), Interpolation(cv::INTER_CUBIC)),\r
- testing::Values(Scale(0.5), Scale(2.0))));\r
+ testing::Values(Interpolation(cv::INTER_NEAREST), Interpolation(cv::INTER_LINEAR),\r
+ Interpolation(cv::INTER_CUBIC), Interpolation(cv::INTER_AREA)),\r
+ testing::Values(Scale(0.5), Scale(0.3)/*, Scale(2.0)*/)));\r
\r
//////////////////////////////////////////////////////////////////////\r
// WarpAffine\r
using perf::MatDepth;\r
\r
CV_ENUM(BorderMode, cv::BORDER_REFLECT101, cv::BORDER_REPLICATE, cv::BORDER_CONSTANT, cv::BORDER_REFLECT, cv::BORDER_WRAP)\r
-CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC)\r
+ CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC, cv::INTER_AREA)\r
CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2, cv::NORM_HAMMING)\r
\r
struct CvtColorInfo\r
testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4),\r
MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4),\r
MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4)),\r
- testing::Values(Interpolation(cv::INTER_NEAREST), Interpolation(cv::INTER_LINEAR), Interpolation(cv::INTER_CUBIC)),\r
- testing::Values(Scale(0.5), Scale(2.0))));\r
+ testing::Values(Interpolation(cv::INTER_NEAREST), Interpolation(cv::INTER_LINEAR),\r
+ Interpolation(cv::INTER_CUBIC), Interpolation(cv::INTER_AREA)),\r
+ testing::Values(Scale(0.5), Scale(0.3)/*, Scale(2.0)*/)));\r
\r
//////////////////////////////////////////////////////////////////////\r
// WarpAffine\r
using perf::MatDepth;\r
\r
CV_ENUM(BorderMode, cv::BORDER_REFLECT101, cv::BORDER_REPLICATE, cv::BORDER_CONSTANT, cv::BORDER_REFLECT, cv::BORDER_WRAP)\r
-CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC)\r
+ CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC, cv::INTER_AREA)\r
CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2, cv::NORM_HAMMING)\r
\r
struct CvtColorInfo\r
AreaFilter< BorderReader< PtrStep<T>, BrdConstant<T> > > filteredSrc(brdSrc, fx, fy);\r
resize_area<<<grid, block, 0, stream>>>(filteredSrc, fx, fy, dst);\r
cudaSafeCall( cudaGetLastError() );\r
+ if (stream == 0)\r
+ cudaSafeCall( cudaDeviceSynchronize() );\r
}\r
};\r
\r
IntegerAreaFilter< BorderReader< PtrStep<T>, BrdConstant<T> > > filteredSrc(brdSrc, fx, fy);\r
resize_area<<<grid, block, 0, stream>>>(filteredSrc, fx, fy, dst);\r
cudaSafeCall( cudaGetLastError() );\r
+ if (stream == 0)\r
+ cudaSafeCall( cudaDeviceSynchronize() );\r
}\r
};\r
\r
ALL_DEVICES,\r
DIFFERENT_SIZES,\r
testing::Values(MatType(CV_8UC3), MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4), MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4)),\r
- testing::Values(/*0.3,*/0.5),\r
+ testing::Values(0.3, 0.5),\r
testing::Values(Interpolation(cv::INTER_AREA)),\r
WHOLE_SUBMAT));\r
\r
cv::Mat expected(5,5,CV_16UC1, expected_data);
cv::resize(src, actual, cv::Size(), 0.3, 0.3, INTER_AREA);
- std::cout << actual << std::endl;
- std::cout << expected << std::endl;
ASSERT_EQ(actual.type(), expected.type());
ASSERT_EQ(actual.size(), expected.size());