From fb74aa76fb6096a861d6a77fbadadc9084ca07ad Mon Sep 17 00:00:00 2001
From: Marc-Stefan Cassola <maccesch@gmail.com>
Date: Wed, 9 Dec 2015 14:23:17 +0100
Subject: [PATCH 1/2] Fixed include error

---
 modules/stereo/include/opencv2/stereo.hpp                | 9 ++-------
 .../{src => include/opencv2/stereo}/descriptor.hpp       | 1 -
 .../stereo/{src => include/opencv2/stereo}/matching.hpp  | 1 -
 modules/stereo/src/descriptor.cpp                        | 1 -
 modules/stereo/src/stereo_binary_bm.cpp                  | 2 --
 modules/stereo/src/stereo_binary_sgbm.cpp                | 2 --
 6 files changed, 2 insertions(+), 14 deletions(-)
 rename modules/stereo/{src => include/opencv2/stereo}/descriptor.hpp (99%)
 rename modules/stereo/{src => include/opencv2/stereo}/matching.hpp (99%)

diff --git a/modules/stereo/include/opencv2/stereo.hpp b/modules/stereo/include/opencv2/stereo.hpp
index fe3ec351e..28b12e886 100644
--- a/modules/stereo/include/opencv2/stereo.hpp
+++ b/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 "stereo/descriptor.hpp"
+#include "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
-
diff --git a/modules/stereo/src/descriptor.hpp b/modules/stereo/include/opencv2/stereo/descriptor.hpp
similarity index 99%
rename from modules/stereo/src/descriptor.hpp
rename to modules/stereo/include/opencv2/stereo/descriptor.hpp
index 6cdab8f33..bdbd7ce75 100644
--- a/modules/stereo/src/descriptor.hpp
+++ b/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_
diff --git a/modules/stereo/src/matching.hpp b/modules/stereo/include/opencv2/stereo/matching.hpp
similarity index 99%
rename from modules/stereo/src/matching.hpp
rename to modules/stereo/include/opencv2/stereo/matching.hpp
index 5d345865b..8c787bbce 100644
--- a/modules/stereo/src/matching.hpp
+++ b/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_
diff --git a/modules/stereo/src/descriptor.cpp b/modules/stereo/src/descriptor.cpp
index 547956d25..2805dbc30 100644
--- a/modules/stereo/src/descriptor.cpp
+++ b/modules/stereo/src/descriptor.cpp
@@ -44,7 +44,6 @@
 *                             The file contains the implemented descriptors                                       *
 \******************************************************************************************************************/
 #include "precomp.hpp"
-#include "descriptor.hpp"
 
 namespace cv
 {
diff --git a/modules/stereo/src/stereo_binary_bm.cpp b/modules/stereo/src/stereo_binary_bm.cpp
index ce262e76d..95ce03bc8 100644
--- a/modules/stereo/src/stereo_binary_bm.cpp
+++ b/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>
 
diff --git a/modules/stereo/src/stereo_binary_sgbm.cpp b/modules/stereo/src/stereo_binary_sgbm.cpp
index ed311e809..f90b0ecf9 100644
--- a/modules/stereo/src/stereo_binary_sgbm.cpp
+++ b/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
 {

From a540326db3c327e8e5d55187c871b220672eea21 Mon Sep 17 00:00:00 2001
From: Marc-Stefan Cassola <maccesch@gmail.com>
Date: Fri, 11 Dec 2015 09:24:37 +0100
Subject: [PATCH 2/2] updated includes for clarity

---
 modules/stereo/include/opencv2/stereo.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stereo/include/opencv2/stereo.hpp b/modules/stereo/include/opencv2/stereo.hpp
index 28b12e886..fc22938b9 100644
--- a/modules/stereo/include/opencv2/stereo.hpp
+++ b/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/descriptor.hpp"
-#include "stereo/matching.hpp"
+#include "opencv2/stereo/descriptor.hpp"
+#include "opencv2/stereo/matching.hpp"
 
 /**
 @defgroup stereo Stereo Correspondance Algorithms