From 13523fd53a7d8d60faf81a872741e0243521612c Mon Sep 17 00:00:00 2001
From: Victor Erukhimov <no@email>
Date: Wed, 26 May 2010 12:34:48 +0000
Subject: [PATCH] Fixing compiler errors for outlet_pose_estimation

---
 include/opencv/cv.h                                    | 18 +++++++++++++-----
 .../include/opencv2/features2d/features2d.hpp          |  7 +++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/include/opencv/cv.h b/include/opencv/cv.h
index e5785c8..235e4c7 100644
--- a/include/opencv/cv.h
+++ b/include/opencv/cv.h
@@ -47,10 +47,6 @@
 #warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
 #endif
 
-#if !defined(CV_IMPL)
-#define CV_IMPL extern "C"
-#endif //CV_IMPL
-
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/core.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
@@ -60,4 +56,16 @@
 #include "opencv2/calib3d/calib3d.hpp"
 #include "opencv2/objdetect/objdetect.hpp"
 
-#endif
+#if !defined(CV_IMPL)
+#define CV_IMPL extern "C"
+#endif //CV_IMPL
+
+#if defined(__cplusplus)
+#include "opencv2/core/internal.hpp"
+#endif //__cplusplus
+
+namespace cv {
+namespace flann = cvflann;
+}
+
+#endif __OPENCV_OLD_CV_H_
diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp
index 14ddc6a..a552692 100644
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -171,6 +171,9 @@ CVAPI(CvSeq*) cvGetStarKeypoints( const CvArr* img, CvMemStorage* storage,
 #ifdef __cplusplus
 }
 
+namespace cv
+{
+
 // CvAffinePose: defines a parameterized affine transformation of an image patch.
 // An image patch is rotated on angle phi (in degrees), then scaled lambda1 times
 // along horizontal and lambda2 times along vertical direction, and then rotated again
@@ -184,10 +187,6 @@ public:
     float lambda2;
 };
 
-
-namespace cv
-{
-
 class CV_EXPORTS KeyPoint
 {
 public:    
-- 
2.7.4