テストの画像生成修正、従来erodeで未対応分を feature に移動

Author: kyaco

modules/ximgproc/test/test_sparse_table_morphology.cpp

@@ -170,12 +170,14 @@ Mat im(int type)
     int depth = CV_MAT_DEPTH(type);
     int ch = CV_MAT_CN(type);
     Mat img = imread(cvtest::TS::ptr()->get_data_path() + "cv/shared/lena.png");
+    if (ch == 1) cv::cvtColor(img, img, ColorConversionCodes::COLOR_BGR2GRAY, ch);
+    if (depth == CV_8S) img /= 2;
     img.convertTo(img, depth);
+    if (depth == CV_16S) img *= 128;
+    if (depth == CV_16U) img *= 256;
+    if (depth == CV_32F) img /= 255;
+    if (depth == CV_64F) img /= 255;
 
-    if (ch == 1)
-    {
-        cv::cvtColor(img, img, ColorConversionCodes::COLOR_BGR2GRAY, ch);
-    }
     return img;
 }
 Mat kn5() { return getStructuringElement(cv::MorphShapes::MORPH_ELLIPSE, Size(5, 5)); }
@@ -201,20 +203,14 @@ void erode_rgr(InputArray src, InputArray kernel, Point anchor = Point(-1, -1),
 }
 TEST(ximgproc_StMorph_erode, regression_8UC1) { erode_rgr(im(CV_8UC1), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_8UC3) { erode_rgr(im(CV_8UC3), kn5()); }
-TEST(ximgproc_StMorph_erode, regression_8SC1) { erode_rgr(im(CV_8SC1), kn5()); }
-TEST(ximgproc_StMorph_erode, regression_8SC3) { erode_rgr(im(CV_8SC3), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_16UC1) { erode_rgr(im(CV_16UC1), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_16UC3) { erode_rgr(im(CV_16UC3), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_16SC1) { erode_rgr(im(CV_16SC1), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_16SC3) { erode_rgr(im(CV_16SC3), kn5()); }
-TEST(ximgproc_StMorph_erode, regression_32SC1) { erode_rgr(im(CV_32SC1), kn5()); }
-TEST(ximgproc_StMorph_erode, regression_32SC3) { erode_rgr(im(CV_32SC3), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_32FC1) { erode_rgr(im(CV_32FC1), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_32FC3) { erode_rgr(im(CV_32FC3), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_64FC1) { erode_rgr(im(CV_64FC1), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_64FC3) { erode_rgr(im(CV_64FC3), kn5()); }
-TEST(ximgproc_StMorph_erode, regression_16FC1) { erode_rgr(im(CV_16FC1), kn5()); }
-TEST(ximgproc_StMorph_erode, regression_16FC3) { erode_rgr(im(CV_16FC3), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_kn5) { erode_rgr(im(CV_8UC3), kn5()); }
 TEST(ximgproc_StMorph_erode, regression_kn4) { erode_rgr(im(CV_8UC3), kn4()); }
 TEST(ximgproc_StMorph_erode, regression_kn1Zero) { erode_rgr(im(CV_8UC3), kn1Zero()); }
@@ -238,8 +234,17 @@ void erode_ftr(InputArray src, InputArray kernel, Point anchor = Point(-1, -1),
 {
     Mat expected, actual;
     stMorph::erode(src, actual, kernel, anchor, iterations, bdrType, bdrVal);
-    assertArraysIdentical(expected, actual);
+    // todo: generate expected result.
+    // assertArraysIdentical(expected, actual);
 }
+/* CV_8S, CV_16F are not supported by morph.simd::getMorphologyFilter */
+TEST(ximgproc_StMorph_erode, feature_8SC1) { erode_ftr(im(CV_8SC1), kn5()); }
+TEST(ximgproc_StMorph_erode, feature_8SC3) { erode_ftr(im(CV_8SC3), kn5()); }
+TEST(ximgproc_StMorph_erode, feature_32SC1) { erode_ftr(im(CV_32SC1), kn5()); }
+TEST(ximgproc_StMorph_erode, feature_32SC3) { erode_ftr(im(CV_32SC3), kn5()); }
+//TEST(ximgproc_StMorph_erode, feature_16FC1) { erode_ftr(im(CV_16FC1), kn5()); }
+//TEST(ximgproc_StMorph_erode, feature_16FC3) { erode_ftr(im(CV_16FC3), kn5()); }
+/* anchor point out of the kernel is not supported. */
 TEST(ximgproc_StMorph_erode, feature_ancOut) { erode_ftr(im(CV_8UC3), kn5(), Point(5, 5)); }
 
 /*