Merge pull request #220 from ilya-lavrenov:SIMDFastAreaResize

3edf7c53 · Vadim Pisarevsky · OpenCV Buildbot · d3354c54 · a319bae6 · 3edf7c53
Commit 3edf7c53 authored Dec 18, 2012 by Vadim Pisarevsky Committed by OpenCV Buildbot Dec 18, 2012
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

perf_resize.cpp modules/imgproc/perf/perf_resize.cpp +1 -1

imgwarp.cpp modules/imgproc/src/imgwarp.cpp +0 -0

No files found.
--- a/modules/imgproc/perf/perf_resize.cpp
+++ b/modules/imgproc/perf/perf_resize.cpp
@@ -71,7 +71,7 @@ typedef TestBaseWithParam<MatInfo_Size_Scale_t> MatInfo_Size_Scale;
 PERF_TEST_P(MatInfo_Size_Scale, ResizeAreaFast,
            testing::Combine(
-                testing::Values(CV_8UC1, CV_8UC4),
+                testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_16UC1, CV_16UC3, CV_16UC4),
                testing::Values(szVGA, szqHD, sz720p, sz1080p),
                testing::Values(2)
                )

--- a/modules/imgproc/src/imgwarp.cpp
+++ b/modules/imgproc/src/imgwarp.cpp