Merge pull request #466 from maccesch:master

Author: vpisarev

modules/stereo/include/opencv2/stereo.hpp

@@ -47,8 +47,8 @@
 #include "opencv2/core.hpp"
 #include "opencv2/features2d.hpp"
 #include "opencv2/core/affine.hpp"
-#include "../../stereo/src/descriptor.hpp"
-#include "../../stereo/src/matching.hpp"
+#include "opencv2/stereo/descriptor.hpp"
+#include "opencv2/stereo/matching.hpp"
 
 /**
 @defgroup stereo Stereo Correspondance Algorithms
@@ -277,9 +277,4 @@ namespace cv
     }//stereo
 } // cv
 
-#ifndef DISABLE_OPENCV_24_COMPATIBILITY
-#include "opencv2/stereo/stereo_c.h"
 #endif
-
-#endif
-

modules/stereo/src/descriptor.hpp renamed to modules/stereo/include/opencv2/stereo/descriptor.hpp

@@ -44,7 +44,6 @@
 *   The interface contains the main descriptors that will be implemented in the descriptor class                  *
 \*****************************************************************************************************************/
 
-#include "precomp.hpp"
 #include <stdint.h>
 #ifndef _OPENCV_DESCRIPTOR_HPP_
 #define _OPENCV_DESCRIPTOR_HPP_

modules/stereo/src/matching.hpp renamed to modules/stereo/include/opencv2/stereo/matching.hpp

@@ -44,7 +44,6 @@
 *   The interface contains the main methods for computing the matching between the left and right images	      *
 *                                                                                                                 *
 \******************************************************************************************************************/
-#include "precomp.hpp"
 #include <stdint.h>
 
 #ifndef _OPENCV_MATCHING_HPP_

modules/stereo/src/descriptor.cpp

@@ -44,7 +44,6 @@
 *                             The file contains the implemented descriptors                                       *
 \******************************************************************************************************************/
 #include "precomp.hpp"
-#include "descriptor.hpp"
 
 namespace cv
 {

modules/stereo/src/stereo_binary_bm.cpp

@@ -46,8 +46,6 @@
 \****************************************************************************************/
 
 #include "precomp.hpp"
-#include "descriptor.hpp"
-#include "matching.hpp"
 #include <stdio.h>
 #include <limits>
 

modules/stereo/src/stereo_binary_sgbm.cpp

@@ -50,8 +50,6 @@ SGBM (Semi-global block matching)
 
 #include "precomp.hpp"
 #include <limits.h>
-#include <descriptor.hpp>
-#include <matching.hpp>
 
 namespace cv
 {