べき長方形分解のテスト追加、不具合修正

Author: kyaco

modules/ximgproc/src/sparse_table_morphology.cpp

@@ -87,9 +87,9 @@ std::vector<Rect> genPow2RectsToCoverKernel(InputArray _kernel)
                         && row < rowLim && ptr[kernel.cols] == 1) continue;
 
                     // ignore if neighboring block is white; will be alive in deeper table
-                    if (col + colOfst <= colLim && ptr[colOfst] == 1) continue;
+                    if (col + colOfst < colLim && ptr[colOfst] == 1) continue;
                     if (col - colOfst >= 0 && ptr[-colOfst] == 1) continue;
-                    if (row + rowOfst <= rowLim && ptr[x] == 1) continue;
+                    if (row + rowOfst < rowLim && ptr[x] == 1) continue;
                     if (row - rowOfst >= 0 && ptr[-x] == 1) continue;
 
                     p2Rects.emplace_back(col, row, colDepth, rowDepth);

modules/ximgproc/test/test_sparse_table_morphology.cpp

@@ -45,6 +45,12 @@ Mat knBig() { return getStructuringElement(cv::MorphShapes::MORPH_RECT, Size(201
 Mat knAsymm (){
     return (Mat_<uchar>(5, 5) << 0,0,0,0,0, 0,0,1,0,0, 0,1,0,0,0, 0,0,0,0,0, 0,0,1,0,0);
 }
+Mat knRnd(int size)
+{
+    Mat rndMat(size, size, CV_8UC1);
+    randu(rndMat, 0, 2);
+    return rndMat;
+}
 
 #pragma endregion
 
@@ -191,6 +197,24 @@ TEST(ximgproc_StMorph_ex, regression_hitmiss) { ex_rgr(im(CV_8UC1), MORPH_HITMIS
 
 #pragma endregion
 
+#pragma region power2RectCovering
+
+void p2RCov(InputArray kernel)
+{
+    std::vector<Rect> p2Rects = stMorph::genPow2RectsToCoverKernel(kernel);
+    Mat expected = kernel.getMat();
+    Mat actual = Mat::zeros(kernel.size(), kernel.type());
+    for (Rect p2Rect: p2Rects)
+    {
+        Rect rect(p2Rect.x, p2Rect.y, 1 << p2Rect.width, 1 << p2Rect.height);
+        actual(rect).setTo(1);
+    }
+    assertArraysIdentical(expected, actual);
+}
+TEST(ximgproc_StMorph_private, feature_P2RCov_rnd) { p2RCov(knRnd(100)); }
+
+#pragma endregion
+
 #pragma region morph_dev
 
 TEST(ximgproc_StMorph_dev, compare_with_original_erode)