opencv_contrib にあれこれ移行

Author: kyaco

modules/ximgproc/include/opencv2/ximgproc.hpp

@@ -63,6 +63,7 @@
 #include "ximgproc/color_match.hpp"
 #include "ximgproc/radon_transform.hpp"
 #include "ximgproc/find_ellipses.hpp"
+#include "ximgproc/sparse_table_morphology.hpp"
 
 
 /**
@@ -116,6 +117,8 @@
 
     The size of the original image is required for compatibility with the imgproc functions when the boundary handling requires that pixel outside the image boundary are
     "on".
+
+    @defgroup ximgproc_sparse_table_morphology Morphology operation with sparse table approach.
 @}
 */
 

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

@@ -0,0 +1,91 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#ifndef __OPENCV_SPARSE_TABLE_MORPHOLOGY_HPP__
+#define __OPENCV_SPARSE_TABLE_MORPHOLOGY_HPP__
+
+#include <opencv2/core.hpp>
+
+namespace cv {
+namespace ximgproc {
+namespace st {
+
+//! @addtogroup ximgproc_sparse_table_morphology
+//! @{
+
+/**
+ * @brief Another implementation of cv::erode with sparse table approach.
+ *
+ * @param src input image; the number of channels can be arbitrary, but the depth should be one of
+ * CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
+ * @param dst output image of the same size and type as src.
+ * @param kernel structuring element used for erosion; if `element=Mat()`, a `3 x 3` rectangular
+ * structuring element is used. Kernel can be created using #getStructuringElement.
+ * @param anchor position of the anchor within the element; default value (-1, -1) means that the
+ * anchor is at the element center.
+ * @param iterations number of times erosion is applied.
+ * @param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+ * @param borderValue border value in case of a constant border
+ *
+ * @see cv::erode
+ */
+CV_EXPORTS_W void erode( InputArray src, OutputArray dst, InputArray kernel,
+                          Point anchor = Point(-1,-1), int iterations = 1,
+                          int borderType = BORDER_CONSTANT,
+                          const Scalar& borderValue = morphologyDefaultBorderValue() );
+
+/**
+ * @brief Another implementation of cv::dilate with sparse table approach.
+ *
+ * @param src input image; the number of channels can be arbitrary, but the depth should be one of
+ * CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
+ * @param dst output image of the same size and type as src.
+ * @param kernel structuring element used for dilation; if element=Mat(), a 3 x 3 rectangular
+ * structuring element is used. Kernel can be created using #getStructuringElement
+ * @param anchor position of the anchor within the element; default value (-1, -1) means that the
+ * anchor is at the element center.
+ * @param iterations number of times dilation is applied.
+ * @param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not suported.
+ * @param borderValue border value in case of a constant border
+ *
+ * @see cv::dilate
+ */
+CV_EXPORTS_W void dilate( InputArray src, OutputArray dst, InputArray kernel,
+                          Point anchor = Point(-1,-1), int iterations = 1,
+                          int borderType = BORDER_CONSTANT,
+                          const Scalar& borderValue = morphologyDefaultBorderValue() );
+
+/**
+ * @brief Another implementation of cv::morphologyEx with sparse table approach.
+
+ * @param src Source image. The number of channels can be arbitrary. The depth should be one of
+ * CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
+ * @param dst Destination image of the same size and type as source image.
+ * @param op Type of a morphological operation, see #MorphTypes
+ * @param kernel Structuring element. It can be created using #getStructuringElement.
+ * @param anchor Anchor position with the kernel. Negative values mean that the anchor is at the
+ * kernel center.
+ * @param iterations Number of times erosion and dilation are applied.
+ * @param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+ * @param borderValue Border value in case of a constant border. The default value has a special
+ * meaning.
+ * @note The number of iterations is the number of times erosion or dilatation operation will be applied.
+ * For instance, an opening operation (#MORPH_OPEN) with two iterations is equivalent to apply
+ * successively: erode -> erode -> dilate -> dilate (and not erode -> dilate -> erode -> dilate).
+ *
+ * @see cv::morphologyEx
+ */
+CV_EXPORTS_W void morphologyEx( InputArray src, OutputArray dst,
+                                int op, InputArray kernel,
+                                Point anchor = Point(-1,-1), int iterations = 1,
+                                int borderType = BORDER_CONSTANT,
+                                const Scalar& borderValue = morphologyDefaultBorderValue() );
+
+//! @}
+
+} // namespace st
+} // namespace ximgproc
+} // namespace cv
+
+#endif

modules/ximgproc/perf/perf_sparse_table_morphology.cpp

@@ -0,0 +1,65 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+#include "perf_precomp.hpp"
+
+namespace opencv_test {
+namespace st_morphology {
+
+typedef tuple<int, Size, int> STParams;
+
+typedef TestBaseWithParam<STParams> STMorphologyPerfTest;
+
+TEST(Typical_Erode, small)
+{
+
+}
+
+PERF_TEST_P(STMorphologyPerfTest, perf, Combine(Values(1,7, 21), Values(sz720p, sz2160p),
+    Values(MORPH_ERODE, MORPH_DILATE, MORPH_OPEN, MORPH_CLOSE, MORPH_GRADIENT,MORPH_TOPHAT, MORPH_BLACKHAT)))
+{
+    STParams params = GetParam();
+    int seSize = get<0>(params);
+    Size sz = get<1>(params);
+    int op = get<2>(params);
+
+    Mat src(sz, CV_8U);
+    Mat thresholded, dstRLE;
+    Mat se = rl::getStructuringElement(MORPH_ELLIPSE, cv::Size(2 * seSize + 1, 2 * seSize + 1));
+
+    declare.in(src, WARMUP_RNG);
+
+    TEST_CYCLE_N(4)
+    {
+        rl::threshold(src, thresholded, 100.0, THRESH_BINARY);
+        rl::morphologyEx(thresholded, dstRLE, op, se);
+    }
+
+    SANITY_CHECK_NOTHING();
+}
+
+typedef tuple<int, Size> STErodeParams;
+typedef TestBaseWithParam<STErodeParams> STErodePerfTest;
+PERF_TEST_P(STErodePerfTest, perf, Combine(Values(1, 7, 21), Values(sz720p, sz2160p)))
+{
+    STErodeParams params = GetParam();
+    int seSize = get<0>(params);
+    Size sz = get<1>(params);
+
+    Mat src(sz, CV_8U);
+    Mat thresholded, dstRLE;
+    Mat se = rl::getStructuringElement(MORPH_ELLIPSE, cv::Size(2 * seSize + 1, 2 * seSize + 1));
+
+    declare.in(src, WARMUP_RNG);
+
+    TEST_CYCLE_N(4)
+    {
+        rl::threshold(src, thresholded, 100.0, THRESH_BINARY);
+        rl::erode(thresholded, dstRLE, se);
+    }
+
+    SANITY_CHECK_NOTHING();
+}
+
+} // st
+} // morphology