カーネル分解リファクタ、不要になった公開メソッドを隠蔽、ユニットテスト修正

Author: kyaco

modules/ximgproc/include/opencv2/ximgproc/sparse_table_morphology.hpp

@@ -14,6 +14,31 @@ namespace stMorph {
 //! @addtogroup imgproc_filter
 //! @{
 
+typedef struct _kernelDecompInfo
+{
+    int rows;
+    int cols;
+    std::vector<std::vector<std::vector<Point>>> stRects;
+    Mat plan;
+    Point anchor;
+    int iterations;
+} kernelDecompInfo;
+
+CV_EXPORTS_W kernelDecompInfo decompKernel(InputArray kernel,
+                                  Point anchor = Point(-1, -1), int iterations = 1);
+
+CV_EXPORTS_W void erode( InputArray src, OutputArray dst, kernelDecompInfo kdi,
+                     BorderTypes borderType = BORDER_CONSTANT,
+                     const Scalar& borderValue = morphologyDefaultBorderValue() );
+
+CV_EXPORTS_W void dilate( InputArray src, OutputArray dst, kernelDecompInfo kdi,
+                     BorderTypes borderType = BORDER_CONSTANT,
+                     const Scalar& borderValue = morphologyDefaultBorderValue() );
+
+CV_EXPORTS_W void morphologyEx( InputArray src, OutputArray dst, int op, kernelDecompInfo kdi,
+                                BorderTypes borderType = BORDER_CONSTANT,
+                                const Scalar& borderValue = morphologyDefaultBorderValue() );
+
 /**
  * @brief Faster implementation of cv::erode with sparse table concept.
  *
@@ -81,42 +106,7 @@ CV_EXPORTS_W void morphologyEx( InputArray src, OutputArray dst,
                                 Point anchor = Point(-1,-1), int iterations = 1,
                                 BorderTypes borderType = BORDER_CONSTANT,
                                 const Scalar& borderValue = morphologyDefaultBorderValue() );
-
-typedef struct _kernelDecompInfo
-{
-    int rows;
-    int cols;
-    std::vector<std::vector<std::vector<Point>>> stRects;
-    Mat plan;
-    Point anchor;
-    int iterations;
-} kernelDecompInfo;
-
-CV_EXPORTS_W kernelDecompInfo getKernelDecompInfo(InputArray kernel,
-                                  Point anchor = Point(-1, -1), int iterations = 1);
-CV_EXPORTS_W void erode( InputArray src, OutputArray dst,
-                     kernelDecompInfo kdi,
-                     BorderTypes borderType = BORDER_CONSTANT,
-                     const Scalar& borderValue = morphologyDefaultBorderValue() );
-CV_EXPORTS_W void dilate( InputArray src, OutputArray dst,
-                     kernelDecompInfo kdi,
-                     BorderTypes borderType = BORDER_CONSTANT,
-                     const Scalar& borderValue = morphologyDefaultBorderValue() );
-CV_EXPORTS_W void morphologyEx( InputArray src, OutputArray dst,
-                                int op, kernelDecompInfo kdi,
-                                BorderTypes borderType = BORDER_CONSTANT,
-                                const Scalar& borderValue = morphologyDefaultBorderValue() );
-
 //! @}
 
-CV_EXPORTS_W std::vector<std::vector<std::vector<Point>>> genPow2RectsToCoverKernel(
-    const Mat& kernel, int rowLim, int colLim);
-CV_EXPORTS_W Mat sparseTableFillPlanning(
-    std::vector<std::vector<std::vector<Point>>> stNodeMap, int rowLim, int colLim);
-
-CV_EXPORTS_W int log2(int n);
-CV_EXPORTS_W int longestRowRunLength(const Mat& kernel);
-CV_EXPORTS_W int longestColRunLength(const Mat& kernel);
-
 }} // cv::stMorph::
 #endif

modules/ximgproc/src/sparse_table_morphology.cpp

@@ -220,6 +220,37 @@ Mat sparseTableFillPlanning(
     return path;
 }
 
+kernelDecompInfo decompKernel(InputArray kernel, Point anchor, int iterations)
+{
+    Mat _kernel = kernel.getMat();
+    // Fix kernel in case of it is empty.
+    if (_kernel.empty())
+    {
+        _kernel = getStructuringElement(MORPH_RECT, Size(1 + iterations * 2, 1 + iterations * 2));
+        anchor = Point(iterations, iterations);
+        iterations = 1;
+    }
+    if (countNonZero(_kernel) == 0)
+    {
+        _kernel.at<uchar>(0, 0) = 1;
+    }
+    // Fix anchor to the center of the kernel.
+    anchor = stMorph::normalizeAnchor(anchor, _kernel.size());
+
+
+    int rowDepthLim = log2(longestRowRunLength(_kernel)) + 1;
+    int colDepthLim = log2(longestColRunLength(_kernel)) + 1;
+    std::vector<std::vector<std::vector<Point>>> pow2Rects
+        = genPow2RectsToCoverKernel(_kernel, rowDepthLim, colDepthLim);
+
+    Mat stPlan
+        = sparseTableFillPlanning(pow2Rects, rowDepthLim, colDepthLim);
+
+    anchor = stMorph::normalizeAnchor(anchor, _kernel.size());
+
+    return { _kernel.rows, _kernel.cols, pow2Rects, stPlan, anchor, iterations };
+}
+
 void morphDfs(int minmax, Mat& st, Mat& dst,
     std::vector<std::vector<std::vector<Point>>> row2Rects, const Mat& stPlan,
     int rowDepth, int colDepth)
@@ -318,37 +349,6 @@ void morphOp(Op minmax, InputArray _src, OutputArray _dst, kernelDecompInfo kdi,
     }
 }
 
-kernelDecompInfo getKernelDecompInfo(InputArray kernel, Point anchor, int iterations)
-{
-    Mat _kernel = kernel.getMat();
-    // Fix kernel in case of it is empty.
-    if (_kernel.empty())
-    {
-        _kernel = getStructuringElement(MORPH_RECT, Size(1 + iterations * 2, 1 + iterations * 2));
-        anchor = Point(iterations, iterations);
-        iterations = 1;
-    }
-    if (countNonZero(_kernel) == 0)
-    {
-        _kernel.at<uchar>(0, 0) = 1;
-    }
-    // Fix anchor to the center of the kernel.
-    anchor = stMorph::normalizeAnchor(anchor, _kernel.size());
-
-
-    int rowDepthLim = log2(longestRowRunLength(_kernel)) + 1;
-    int colDepthLim = log2(longestColRunLength(_kernel)) + 1;
-    std::vector<std::vector<std::vector<Point>>> pow2Rects
-        = genPow2RectsToCoverKernel(_kernel, rowDepthLim, colDepthLim);
-
-    Mat stPlan
-        = sparseTableFillPlanning(pow2Rects, rowDepthLim, colDepthLim);
-
-    anchor = stMorph::normalizeAnchor(anchor, _kernel.size());
-
-    return { _kernel.rows, _kernel.cols, pow2Rects, stPlan, anchor, iterations };
-}
-
 void erode(InputArray src, OutputArray dst, kernelDecompInfo kdi,
     BorderTypes borderType, const Scalar& borderVal)
 {
@@ -408,26 +408,25 @@ void morphologyEx(InputArray src, OutputArray dst, int op, kernelDecompInfo kdi,
         _dst = temp - _src;
         break;
     case MORPH_HITMISS:
-        CV_Error(cv::Error::StsBadArg, "stMorph doesn't support HITMISS operation");
+        CV_Error(cv::Error::StsBadArg, "StMorph doesn't support HIT-MISS operation.");
     default:
-        CV_Error(cv::Error::StsBadArg, "unknown morphological operation");
+        CV_Error(cv::Error::StsBadArg, "Unknown morphological operation.");
     }
 }
 
-//------------------------------------------
 void erode(InputArray src, OutputArray dst, InputArray kernel,
     Point anchor, int iterations,
     BorderTypes borderType, const Scalar& borderVal)
 {
-    kernelDecompInfo kdi = getKernelDecompInfo(kernel, anchor, iterations);
+    kernelDecompInfo kdi = decompKernel(kernel, anchor, iterations);
     morphOp(Op::Min, src, dst, kdi, borderType, borderVal);
 }
 
 void dilate(InputArray src, OutputArray dst, InputArray kernel,
     Point anchor, int iterations,
     BorderTypes borderType, const Scalar& borderVal)
 {
-    kernelDecompInfo kdi = getKernelDecompInfo(kernel, anchor, iterations);
+    kernelDecompInfo kdi = decompKernel(kernel, anchor, iterations);
     morphOp(Op::Max, src, dst, kdi, borderType, borderVal);
 }
 
@@ -442,7 +441,7 @@ void morphologyEx(InputArray src, OutputArray dst, int op,
         _kernel = getStructuringElement(MORPH_RECT, Size(3, 3), Point(1, 1));
     }
 
-    kernelDecompInfo kdi = getKernelDecompInfo(_kernel, anchor, iterations);
+    kernelDecompInfo kdi = decompKernel(_kernel, anchor, iterations);
     morphologyEx(src, dst, op, kdi, borderType, borderVal);
 }