Merge pull request #1455 from alalek:ximgproc_fix_namespace

modules/ximgproc/include/opencv2/ximgproc/peilin.hpp

@@ -7,8 +7,8 @@
 
 #include <opencv2/core.hpp>
 
-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

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 );

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