renamed internal folders

modules/ximgproc/doc/ximgproc.rst

@@ -8,3 +8,4 @@ ximgproc. Extended image processing module.
     :maxdepth: 2
 
     edge_aware_filters
+    structured_edge_detection

modules/ximgproc/doc/ximpgroc.rst

@@ -1,8 +0,0 @@
-********************************************
-ximpgroc. Advanced edge-detection algorithms
-********************************************
-
-.. toctree::
-    :maxdepth: 2
-
-    Structured forests for fast edge detection <ximpgroc/structured_edge_detection>

modules/ximgproc/include/opencv2/ximgproc.hpp

@@ -38,5 +38,6 @@
 #define __OPENCV_XIMGPROC_HPP__
 
 #include "ximgproc/edge_filter.hpp"
+#include "ximpgroc/structured_edge_detection.hpp"
 
 #endif

modules/ximgproc/include/opencv2/ximpgroc.hpp

@@ -1,48 +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.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., 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 the copyright holders 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_EDGEDETECTION_HPP__
-#define __OPENCV_EDGEDETECTION_HPP__
-
-#include "opencv2/core.hpp"
-#include "opencv2/ximpgroc/structured_edge_detection.hpp"
-#endif