非公開分をcpp側に移動

Author: kyaco

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

@@ -8,8 +8,7 @@
 #include <opencv2/core.hpp>
 #include <vector>
 
-namespace cv {
-namespace stMorph {
+namespace cv { namespace stMorph {
 
 //! @addtogroup imgproc_filter
 //! @{
@@ -84,22 +83,6 @@ CV_EXPORTS_W void morphologyEx( InputArray src, OutputArray dst,
 
 //! @}
 
-// normalizeAnchor; Copied from filterengine.hpp.
-static inline Point normalizeAnchor(Point anchor, Size ksize)
-{
-    if (anchor.x == -1)
-        anchor.x = ksize.width / 2;
-    if (anchor.y == -1)
-        anchor.y = ksize.height / 2;
-    CV_Assert(anchor.inside(Rect(0, 0, ksize.width, ksize.height)));
-    return anchor;
-}
-
-enum Op
-{
-    Min, Max
-};
-
 /*
 * Find a set of power-2-rectangles to cover the kernel.
 * power-2-rectangles is a rectangle whose height and width are both power of 2.
@@ -120,8 +103,7 @@ 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

@@ -7,8 +7,23 @@
 #include <utility>
 #include <vector>
 
-namespace cv {
-namespace stMorph {
+namespace cv { namespace stMorph {
+
+// normalizeAnchor; Copied from filterengine.hpp.
+static inline Point normalizeAnchor(Point anchor, Size ksize)
+{
+    if (anchor.x == -1)
+        anchor.x = ksize.width / 2;
+    if (anchor.y == -1)
+        anchor.y = ksize.height / 2;
+    CV_Assert(anchor.inside(Rect(0, 0, ksize.width, ksize.height)));
+    return anchor;
+}
+
+enum Op
+{
+    Min, Max
+};
 
 int log2(int n)
 {
@@ -415,4 +430,4 @@ void morphologyEx(InputArray src, OutputArray dst, int op,
     }
 }
 
-}} // cv::st::
+}}