put all old stitching API into detail namespace

modules/stitching/include/opencv2/stitching/detail/autocalib.hpp

@@ -45,8 +45,8 @@
 #include "opencv2/core/core.hpp"
 #include "matchers.hpp"
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 // See "Construction of Panoramic Image Mosaics with Global and Local Alignment"
 // by Heung-Yeung Shum and Richard Szeliski.
@@ -58,6 +58,7 @@ void CV_EXPORTS estimateFocal(const std::vector<ImageFeatures> &features,
 
 bool CV_EXPORTS calibrateRotatingCamera(const std::vector<Mat> &Hs, Mat &K);
 
+} // namespace detail
 } // namespace cv
 
 #endif // __OPENCV_STITCHING_AUTOCALIB_HPP__

modules/stitching/include/opencv2/stitching/detail/blenders.hpp

@@ -44,8 +44,8 @@
 
 #include "opencv2/core/core.hpp"
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 // Simple blender which puts one image over another
 class CV_EXPORTS Blender
@@ -119,6 +119,7 @@ void CV_EXPORTS createLaplacePyrGpu(const Mat &img, int num_levels, std::vector<
 // Restores source image
 void CV_EXPORTS restoreImageFromLaplacePyr(std::vector<Mat>& pyr);
 
+} // namespace detail
 } // namespace cv
 
 #endif // __OPENCV_STITCHING_BLENDERS_HPP__

modules/stitching/include/opencv2/stitching/detail/camera.hpp

@@ -44,8 +44,8 @@
 
 #include "opencv2/core/core.hpp"
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 struct CV_EXPORTS CameraParams
 {
@@ -58,6 +58,7 @@ struct CV_EXPORTS CameraParams
     Mat t; // Translation
 };
 
+} // namespace detail
 } // namespace cv
 
 #endif // #ifndef __OPENCV_STITCHING_CAMERA_HPP__

modules/stitching/include/opencv2/stitching/detail/exposure_compensate.hpp

@@ -44,8 +44,8 @@
 
 #include "opencv2/core/core.hpp"
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 class CV_EXPORTS ExposureCompensator
 {
@@ -99,6 +99,7 @@ private:
     std::vector<Mat_<float> > gain_maps_;
 };
 
+} // namespace detail
 } // namespace cv
 
 #endif // __OPENCV_STITCHING_EXPOSURE_COMPENSATE_HPP__

modules/stitching/include/opencv2/stitching/detail/matchers.hpp

@@ -45,8 +45,8 @@
 #include "opencv2/core/core.hpp"
 #include "opencv2/features2d/features2d.hpp"
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 struct CV_EXPORTS ImageFeatures
 {
@@ -140,6 +140,7 @@ protected:
     cv::Ptr<FeaturesMatcher> impl_;
 };
 
+} // namespace detail
 } // namespace cv
 
 #endif // __OPENCV_STITCHING_MATCHERS_HPP__

modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp

@@ -47,8 +47,8 @@
 #include "util.hpp"
 #include "camera.hpp"
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 class CV_EXPORTS Estimator
 {
@@ -126,6 +126,7 @@ std::vector<int> CV_EXPORTS leaveBiggestComponent(std::vector<ImageFeatures> &fe
 void CV_EXPORTS findMaxSpanningTree(int num_images, const std::vector<MatchesInfo> &pairwise_matches, 
                                     Graph &span_tree, std::vector<int> &centers);
 
+} // namespace detail
 } // namespace cv
 
 #endif // __OPENCV_STITCHING_MOTION_ESTIMATORS_HPP__

modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp

@@ -44,8 +44,8 @@
 
 #include "opencv2/core/core.hpp"
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 class CV_EXPORTS SeamFinder
 {
@@ -103,6 +103,7 @@ private:
     Ptr<Impl> impl_;
 };
 
+} // namespace detail
 } // namespace cv
 
 #endif // __OPENCV_STITCHING_SEAM_FINDERS_HPP__

modules/stitching/include/opencv2/stitching/detail/util.hpp

@@ -56,8 +56,8 @@
 
 #define LOGLN(msg) LOG(msg << std::endl)
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 class CV_EXPORTS DisjointSets
 {
@@ -114,6 +114,7 @@ Point CV_EXPORTS resultTl(const std::vector<Point> &corners);
 // Returns random 'count' element subset of the {0,1,...,size-1} set
 void CV_EXPORTS selectRandomSubset(int count, int size, std::vector<int> &subset);
 
+} // namespace detail
 } // namespace cv
 
 #include "util_inl.hpp"

modules/stitching/include/opencv2/stitching/detail/util_inl.hpp

@@ -46,8 +46,8 @@
 #include "opencv2/core/core.hpp"
 #include "util.hpp" // Make your IDE see declarations
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 template <typename B>
 B Graph::forEach(B body) const
@@ -120,6 +120,7 @@ static inline int sqr(int x) { return x * x; }
 static inline float sqr(float x) { return x * x; }
 static inline double sqr(double x) { return x * x; }
 
+} // namespace detail
 } // namespace cv
 
 #endif // __OPENCV_STITCHING_UTIL_INL_HPP__

modules/stitching/include/opencv2/stitching/detail/warpers.hpp

@@ -46,8 +46,8 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/gpu/gpu.hpp"
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 class CV_EXPORTS Warper
 {
@@ -194,6 +194,7 @@ private:
     gpu::GpuMat d_xmap_, d_ymap_, d_dst_, d_src_;
 };
 
+} // namespace detail
 } // namespace cv
 
 #include "warpers_inl.hpp"

modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp

@@ -45,8 +45,8 @@
 #include "opencv2/core/core.hpp"
 #include "warpers.hpp" // Make your IDE see declarations
 
-namespace cv
-{
+namespace cv {
+namespace detail {
 
 template <class P>
 Point WarperBase<P>::warp(const Mat &src, float focal, const Mat &R, Mat &dst,
@@ -256,6 +256,7 @@ void CylindricalProjector::mapBackward(float u, float v, float &x, float &y)
     y = focal * y / z + size.height * 0.5f;
 }
 
+} // namespace detail
 } // namespace cv
 
 #endif // __OPENCV_STITCHING_WARPERS_INL_HPP__

modules/stitching/include/opencv2/stitching/stitching.hpp

@@ -1,54 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  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.
-//
-//
-//                        Intel License Agreement
-//
-// Copyright (C) 2000, Intel Corporation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's 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.
-//
-//   * The name of Intel Corporation may not 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 the Intel Corporation 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.
-//
-//M*/
-
-#ifndef __OPENCV_STITCHING_HPP__
-#define __OPENCV_STITCHING_HPP__
-
-#include "opencv2/stitching/autocalib.hpp"
-#include "opencv2/stitching/blenders.hpp"
-#include "opencv2/stitching/camera.hpp"
-#include "opencv2/stitching/exposure_compensate.hpp"
-#include "opencv2/stitching/matchers.hpp"
-#include "opencv2/stitching/motion_estimators.hpp"
-#include "opencv2/stitching/seam_finders.hpp"
-#include "opencv2/stitching/util.hpp"
-#include "opencv2/stitching/warpers.hpp"
-
-#endif // __OPENCV_STITCHING_HPP__