pragma region 記述を削除

Author: kyaco

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

@@ -9,6 +9,7 @@
 #include <vector>
 
 namespace cv {
+namespace ximgproc {
 namespace stMorph {
 
 //! @addtogroup imgproc_filter
@@ -162,5 +163,5 @@ CV_EXPORTS_W void morphologyEx( InputArray src, OutputArray dst,
                                 const Scalar& borderValue = morphologyDefaultBorderValue() );
 //! @}
 
-}} // cv::stMorph::
+}}} // cv::ximgproc::stMorph::
 #endif

modules/ximgproc/src/sparse_table_morphology.cpp

@@ -8,10 +8,9 @@
 #include <vector>
 
 namespace cv {
+namespace ximgproc {
 namespace stMorph {
 
-#pragma region decompKernel
-
 // normalizeAnchor; Copied from filterengine.hpp.
 static inline Point normalizeAnchor(Point anchor, Size ksize)
 {
@@ -235,10 +234,6 @@ kernelDecompInfo decompKernel(InputArray kernel, Point anchor, int iterations)
     return { _kernel.rows, _kernel.cols, pow2Rects, stPlan, anchor, iterations };
 }
 
-#pragma endregion
-
-#pragma region st-morphology
-
 enum Op
 {
     Min, Max
@@ -407,10 +402,6 @@ void morphologyEx(InputArray src, OutputArray dst, int op, kernelDecompInfo kdi,
     }
 }
 
-#pragma endregion
-
-#pragma region cv-morphology
-
 void erode(InputArray src, OutputArray dst, InputArray kernel,
     Point anchor, int iterations,
     BorderTypes borderType, const Scalar& borderVal)
@@ -435,6 +426,4 @@ void morphologyEx(InputArray src, OutputArray dst, int op,
     morphologyEx(src, dst, op, kdi, borderType, borderVal);
 }
 
-#pragma endregion
-
-}} // cv::stMorph::
+}}} // cv::ximgproc::stMorph::

modules/ximgproc/test/test_sparse_table_morphology.cpp

@@ -9,8 +9,6 @@
 namespace opencv_test {
 namespace {
 
-#pragma region Common test methods
-
 void assertArraysIdentical(InputArray ary1, InputArray ary2)
 {
     Mat xor = ary1.getMat() ^ ary2.getMat();
@@ -55,10 +53,6 @@ Mat knRnd(int size, int density)
     return rndMat;
 }
 
-#pragma endregion
-
-#pragma region dilasion
-
 /*
 * dilate regression tests.
 */
@@ -114,10 +108,6 @@ TEST(ximgproc_StMorph_dilate, feature_8SC3) { dilate_ftr(im(CV_8SC3), kn5()); }
 TEST(ximgproc_StMorph_dilate, feature_32SC1) { dilate_ftr(im(CV_32SC1), kn5()); }
 TEST(ximgproc_StMorph_dilate, feature_32SC3) { dilate_ftr(im(CV_32SC3), kn5()); }
 
-#pragma endregion
-
-#pragma region erosion
-
 /*
 * erode regression tests.
 */
@@ -173,10 +163,6 @@ 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()); }
 
-#pragma endregion
-
-#pragma region morphologyEx
-
 /*
 * morphologyEx regression tests.
 */
@@ -201,10 +187,6 @@ TEST(ximgproc_StMorph_ex, regression_hitmiss)
     EXPECT_THROW( { ex_rgr(im(CV_8UC1), MORPH_HITMISS, kn5()); }, cv::Exception);
 }
 
-#pragma endregion
-
-#pragma region decomposition
-
 stMorph::kernelDecompInfo ftr_decomp(InputArray kernel)
 {
     auto kdi = stMorph::decompKernel(kernel);
@@ -325,10 +307,6 @@ TEST(ximgproc_StMorph_decomp, feature_visualize) {
 #endif
 }
 
-#pragma endregion
-
-#pragma region morph_comp
-
 TEST(ximgproc_StMorph_eval, pdi)
 {
     Mat img = im(CV_8UC3);
@@ -510,6 +488,5 @@ TEST(ximgproc_StMorph_eval, integrated)
     }
     ss.close();
 }
-#pragma endregion
 
 }} // opencv_test:: ::