From c1780f67b8a2566cb98bc33a181529eee5232fa7 Mon Sep 17 00:00:00 2001 From: Alexander Shishkov Date: Fri, 15 Aug 2014 11:44:13 +0400 Subject: [PATCH] renamed internal folders --- .../prediction/images/01.jpg | Bin .../prediction/images/02.jpg | Bin .../prediction/images/03.jpg | Bin .../prediction/images/04.jpg | Bin .../prediction/images/05.jpg | Bin .../prediction/images/06.jpg | Bin .../prediction/images/07.jpg | Bin .../prediction/images/08.jpg | Bin .../prediction/images/09.jpg | Bin .../prediction/images/10.jpg | Bin .../prediction/images/11.jpg | Bin .../prediction/images/12.jpg | Bin .../prediction/prediction.rst | 0 .../training/scripts/modelConvert.m | 0 .../training/training.rst | 0 .../structured_edge_detection.rst | 0 modules/ximgproc/doc/ximgproc.rst | 1 + modules/ximgproc/doc/ximpgroc.rst | 8 --- modules/ximgproc/include/opencv2/ximgproc.hpp | 1 + .../structured_edge_detection.hpp | 0 modules/ximgproc/include/opencv2/ximpgroc.hpp | 48 ------------------ ...cpp => test_structured_edge_detection.cpp} | 0 22 files changed, 2 insertions(+), 56 deletions(-) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/01.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/02.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/03.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/04.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/05.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/06.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/07.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/08.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/09.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/10.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/11.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/images/12.jpg (100%) rename doc/tutorials/{ximpgroc => ximgproc}/prediction/prediction.rst (100%) rename doc/tutorials/{ximpgroc => ximgproc}/training/scripts/modelConvert.m (100%) rename doc/tutorials/{ximpgroc => ximgproc}/training/training.rst (100%) rename modules/ximgproc/doc/{ximpgroc => }/structured_edge_detection.rst (100%) delete mode 100644 modules/ximgproc/doc/ximpgroc.rst rename modules/ximgproc/include/opencv2/{ximpgroc => ximgproc}/structured_edge_detection.hpp (100%) delete mode 100644 modules/ximgproc/include/opencv2/ximpgroc.hpp rename modules/ximgproc/test/{structured_edge_detection.cpp => test_structured_edge_detection.cpp} (100%) diff --git a/doc/tutorials/ximpgroc/prediction/images/01.jpg b/doc/tutorials/ximgproc/prediction/images/01.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/01.jpg rename to doc/tutorials/ximgproc/prediction/images/01.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/02.jpg b/doc/tutorials/ximgproc/prediction/images/02.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/02.jpg rename to doc/tutorials/ximgproc/prediction/images/02.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/03.jpg b/doc/tutorials/ximgproc/prediction/images/03.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/03.jpg rename to doc/tutorials/ximgproc/prediction/images/03.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/04.jpg b/doc/tutorials/ximgproc/prediction/images/04.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/04.jpg rename to doc/tutorials/ximgproc/prediction/images/04.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/05.jpg b/doc/tutorials/ximgproc/prediction/images/05.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/05.jpg rename to doc/tutorials/ximgproc/prediction/images/05.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/06.jpg b/doc/tutorials/ximgproc/prediction/images/06.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/06.jpg rename to doc/tutorials/ximgproc/prediction/images/06.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/07.jpg b/doc/tutorials/ximgproc/prediction/images/07.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/07.jpg rename to doc/tutorials/ximgproc/prediction/images/07.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/08.jpg b/doc/tutorials/ximgproc/prediction/images/08.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/08.jpg rename to doc/tutorials/ximgproc/prediction/images/08.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/09.jpg b/doc/tutorials/ximgproc/prediction/images/09.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/09.jpg rename to doc/tutorials/ximgproc/prediction/images/09.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/10.jpg b/doc/tutorials/ximgproc/prediction/images/10.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/10.jpg rename to doc/tutorials/ximgproc/prediction/images/10.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/11.jpg b/doc/tutorials/ximgproc/prediction/images/11.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/11.jpg rename to doc/tutorials/ximgproc/prediction/images/11.jpg diff --git a/doc/tutorials/ximpgroc/prediction/images/12.jpg b/doc/tutorials/ximgproc/prediction/images/12.jpg similarity index 100% rename from doc/tutorials/ximpgroc/prediction/images/12.jpg rename to doc/tutorials/ximgproc/prediction/images/12.jpg diff --git a/doc/tutorials/ximpgroc/prediction/prediction.rst b/doc/tutorials/ximgproc/prediction/prediction.rst similarity index 100% rename from doc/tutorials/ximpgroc/prediction/prediction.rst rename to doc/tutorials/ximgproc/prediction/prediction.rst diff --git a/doc/tutorials/ximpgroc/training/scripts/modelConvert.m b/doc/tutorials/ximgproc/training/scripts/modelConvert.m similarity index 100% rename from doc/tutorials/ximpgroc/training/scripts/modelConvert.m rename to doc/tutorials/ximgproc/training/scripts/modelConvert.m diff --git a/doc/tutorials/ximpgroc/training/training.rst b/doc/tutorials/ximgproc/training/training.rst similarity index 100% rename from doc/tutorials/ximpgroc/training/training.rst rename to doc/tutorials/ximgproc/training/training.rst diff --git a/modules/ximgproc/doc/ximpgroc/structured_edge_detection.rst b/modules/ximgproc/doc/structured_edge_detection.rst similarity index 100% rename from modules/ximgproc/doc/ximpgroc/structured_edge_detection.rst rename to modules/ximgproc/doc/structured_edge_detection.rst diff --git a/modules/ximgproc/doc/ximgproc.rst b/modules/ximgproc/doc/ximgproc.rst index 8852e3aca..d5554ce22 100644 --- a/modules/ximgproc/doc/ximgproc.rst +++ b/modules/ximgproc/doc/ximgproc.rst @@ -8,3 +8,4 @@ ximgproc. Extended image processing module. :maxdepth: 2 edge_aware_filters + structured_edge_detection diff --git a/modules/ximgproc/doc/ximpgroc.rst b/modules/ximgproc/doc/ximpgroc.rst deleted file mode 100644 index 28e586fc1..000000000 --- a/modules/ximgproc/doc/ximpgroc.rst +++ /dev/null @@ -1,8 +0,0 @@ -******************************************** -ximpgroc. Advanced edge-detection algorithms -******************************************** - -.. toctree:: - :maxdepth: 2 - - Structured forests for fast edge detection diff --git a/modules/ximgproc/include/opencv2/ximgproc.hpp b/modules/ximgproc/include/opencv2/ximgproc.hpp index da0635efa..56cbc99a0 100644 --- a/modules/ximgproc/include/opencv2/ximgproc.hpp +++ b/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 \ No newline at end of file diff --git a/modules/ximgproc/include/opencv2/ximpgroc/structured_edge_detection.hpp b/modules/ximgproc/include/opencv2/ximgproc/structured_edge_detection.hpp similarity index 100% rename from modules/ximgproc/include/opencv2/ximpgroc/structured_edge_detection.hpp rename to modules/ximgproc/include/opencv2/ximgproc/structured_edge_detection.hpp diff --git a/modules/ximgproc/include/opencv2/ximpgroc.hpp b/modules/ximgproc/include/opencv2/ximpgroc.hpp deleted file mode 100644 index 31ed0122a..000000000 --- a/modules/ximgproc/include/opencv2/ximpgroc.hpp +++ /dev/null @@ -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 diff --git a/modules/ximgproc/test/structured_edge_detection.cpp b/modules/ximgproc/test/test_structured_edge_detection.cpp similarity index 100% rename from modules/ximgproc/test/structured_edge_detection.cpp rename to modules/ximgproc/test/test_structured_edge_detection.cpp