MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4)),\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
+ testing::Values(Scale(0.5), Scale(0.3), Scale(2.0))));\r
\r
//////////////////////////////////////////////////////////////////////\r
// WarpAffine\r
MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4)),\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
+ testing::Values(Scale(0.5), Scale(0.3), Scale(2.0))));\r
\r
//////////////////////////////////////////////////////////////////////\r
// WarpAffine\r
ResizeDispatcher<CubicFilter, T>::call,\r
ResizeDispatcher<AreaFilter, T>::call\r
};\r
+ // chenge to linear if area interpolation upscaling\r
+ if (interpolation == 3 && (fx <= 1.f || fy <= 1.f))\r
+ interpolation = 1;\r
\r
callers[interpolation](static_cast< DevMem2D_<T> >(src), static_cast< DevMem2D_<T> >(srcWhole), xoff, yoff, fx, fy, \r
static_cast< DevMem2D_<T> >(dst), stream);\r