From 2700b7d40587474b8808d02643397539553942db Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 20 Nov 2017 21:49:44 +0300 Subject: [PATCH] ximgproc: fix namespace --- modules/ximgproc/include/opencv2/ximgproc/peilin.hpp | 7 ++++--- modules/ximgproc/samples/peilin.cpp | 4 ++-- modules/ximgproc/src/peilin.cpp | 5 ++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/ximgproc/include/opencv2/ximgproc/peilin.hpp b/modules/ximgproc/include/opencv2/ximgproc/peilin.hpp index 6c7aa56da..1b224aaf8 100644 --- a/modules/ximgproc/include/opencv2/ximgproc/peilin.hpp +++ b/modules/ximgproc/include/opencv2/ximgproc/peilin.hpp @@ -7,8 +7,8 @@ #include -namespace cv -{ +namespace cv { namespace ximgproc { + //! @addtogroup ximgproc //! @{ @@ -26,6 +26,7 @@ namespace cv CV_EXPORTS Matx23d PeiLinNormalization ( InputArray I ); /** @overload */ CV_EXPORTS_W void PeiLinNormalization ( InputArray I, OutputArray T ); -} + +}} // namespace #endif diff --git a/modules/ximgproc/samples/peilin.cpp b/modules/ximgproc/samples/peilin.cpp index 75e934bdc..92834e3ec 100644 --- a/modules/ximgproc/samples/peilin.cpp +++ b/modules/ximgproc/samples/peilin.cpp @@ -48,8 +48,8 @@ int main(int argc, char** argv) std::cout << "Couldn't open image " << filename2 << std::endl; return 0; } - cv::Mat N = I & cv::PeiLinNormalization ( I ); - cv::Mat D = cv::PeiLinNormalization ( J ) & I; + cv::Mat N = I & cv::ximgproc::PeiLinNormalization ( I ); + cv::Mat D = cv::ximgproc::PeiLinNormalization ( J ) & I; cv::imshow ( "I", I ); cv::imshow ( "N", N ); cv::imshow ( "J", J ); diff --git a/modules/ximgproc/src/peilin.cpp b/modules/ximgproc/src/peilin.cpp index 959f2245b..882987ed3 100644 --- a/modules/ximgproc/src/peilin.cpp +++ b/modules/ximgproc/src/peilin.cpp @@ -4,8 +4,7 @@ #include "precomp.hpp" -namespace cv -{ +namespace cv { namespace ximgproc { static inline Moments operator& ( const Moments & lhs, const Matx22d & rhs ) { @@ -54,4 +53,4 @@ namespace cv T.assign ( Mat ( PeiLinNormalization ( I ) ) ); } -} +}} // namespace