convertTo from 64f

63fc6ef3 · Ilya Lavrenov · 8870ef41 · 63fc6ef3 · 63fc6ef3
Commit 63fc6ef3 authored Jan 12, 2015 by Ilya Lavrenov
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

perf_convertTo.cpp modules/core/perf/perf_convertTo.cpp +2 -2

convert.cpp modules/core/src/convert.cpp +0 -0

No files found.
--- a/modules/core/perf/perf_convertTo.cpp
+++ b/modules/core/perf/perf_convertTo.cpp
@@ -13,8 +13,8 @@ PERF_TEST_P( Size_DepthSrc_DepthDst_Channels_alpha, convertTo,
             testing::Combine
             (
                 testing::Values(szVGA, sz1080p),
-                 testing::Values<MatType>(CV_8U),
+                 testing::Values(CV_8U, CV_8S, CV_16U, CV_16S, CV_32S, CV_32F, CV_64F),
-                 testing::Values<MatType>(CV_16U),
+                 testing::Values(CV_8U, CV_8S, CV_16U, CV_16S, CV_32S, CV_32F, CV_64F),
                 testing::Values(1, 4),
                 testing::Values(1.0, 1./255)
             )

--- a/modules/core/src/convert.cpp
+++ b/modules/core/src/convert.cpp