ライセンス表記や名前空間、ドキュメントの修正

Author: kyaco

modules/ximgproc/include/opencv2/ximgproc.hpp

@@ -117,8 +117,6 @@
 
     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

@@ -9,13 +9,13 @@
 
 namespace cv {
 namespace ximgproc {
-namespace st {
+namespace stMorph {
 
-//! @addtogroup ximgproc_sparse_table_morphology
+//! @addtogroup imgproc_filter
 //! @{
 
 /**
- * @brief Another implementation of cv::erode with sparse table approach.
+ * @brief Faster implementation of cv::erode with sparse table concept.
  *
  * @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.
@@ -36,7 +36,7 @@ CV_EXPORTS_W void erode( InputArray src, OutputArray dst, InputArray kernel,
                           const Scalar& borderValue = morphologyDefaultBorderValue() );
 
 /**
- * @brief Another implementation of cv::dilate with sparse table approach.
+ * @brief Faster implementation of cv::dilate with sparse table concept.
  *
  * @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.
@@ -57,7 +57,7 @@ CV_EXPORTS_W void dilate( InputArray src, OutputArray dst, InputArray kernel,
                           const Scalar& borderValue = morphologyDefaultBorderValue() );
 
 /**
- * @brief Another implementation of cv::morphologyEx with sparse table approach.
+ * @brief Faster implementation of cv::morphologyEx with sparse table concept.
 
  * @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.

modules/ximgproc/perf/perf_sparse_table_morphology.cpp

@@ -1,10 +1,11 @@
 // 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 {
+namespace stMorph {
 
 typedef tuple<int, Size, int> STParams;
 

modules/ximgproc/src/sparse_table_morphology.cpp

@@ -1,38 +1,7 @@
-/*
- *  By downloading, copying, installing or using the software you agree to this license.
- *  If you do not agree to this license, do not download, install,
- *  copy or use the software.
- *
- *
- *  License Agreement
- *  For Open Source Computer Vision Library
- *  (3 - clause BSD License)
- *
- *  Redistribution and use in source and binary forms, with or without modification,
- *  are permitted provided that the following conditions are met :
- *
- *  * Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and / or other materials provided with the distribution.
- *
- *  * Neither the names of the copyright holders nor the names of the contributors
- *  may be used to endorse or promote products derived from this software
- *  without specific prior written permission.
- *
- *  This software is provided by the copyright holders and contributors "as is" and
- *  any express or implied warranties, including, but not limited to, the implied
- *  warranties of merchantability and fitness for a particular purpose are disclaimed.
- *  In no event shall copyright holders or contributors be liable for any direct,
- *  indirect, incidental, special, exemplary, or consequential damages
- *  (including, but not limited to, procurement of substitute goods or services;
- *  loss of use, data, or profits; or business interruption) however caused
- *  and on any theory of liability, whether in contract, strict liability,
- *  or tort(including negligence or otherwise) arising in any way out of
- *  the use of this software, even if advised of the possibility of such damage.
- */
+// 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 "precomp.hpp"
 #include <math.h>
 #include <vector>
@@ -43,7 +12,7 @@
 
 namespace cv {
 namespace ximgproc {
-namespace st {
+namespace stMorph {
 
 // normalizeAnchor; Copied from filterengine.hpp.
 static inline Point normalizeAnchor(Point anchor, Size ksize)
@@ -320,7 +289,7 @@ void erode(InputArray _src, OutputArray _dst, InputArray _kernel,
     Mat src = _src.getMat();
     Mat dst = _dst.getMat();
     Mat kernel = _kernel.getMat();
-    anchor = st::normalizeAnchor(anchor, kernel.size());
+    anchor = stMorph::normalizeAnchor(anchor, kernel.size());
 
     // iterations; is it needed yet?
     // borderType; BORDER_CONSTANT

modules/ximgproc/test/test_sparse_table_morphology.cpp

@@ -1,12 +1,13 @@
 // 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 "test_precomp.hpp"
 #include "opencv2/ximgproc/sparse_table_morphology.hpp"
 #include "opencv2/imgproc.hpp"
 
 namespace opencv_test {
-namespace st_morphology {
+namespace stMorph {
 
 TEST(ximgproc_SparseTableMorph, compare_with_original_erode)
 {
@@ -40,7 +41,7 @@ TEST(ximgproc_SparseTableMorph, compare_with_original_erode)
 
     // proposal
     timer.start();
-    ximgproc::st::erode(src, actual, kernel); // 217ms for Elipse, kSize = 101
+    ximgproc::stMorph::erode(src, actual, kernel); // 217ms for Elipse, kSize = 101
     timer.stop();
     double proposalTime = timer.getTimeMilli();