From e14f91dd3708eb2f40c5b184023d66f2bf6e6138 Mon Sep 17 00:00:00 2001
From: edgarriba <edgar.riba@gmail.com>
Date: Wed, 6 Aug 2014 08:18:11 +0200
Subject: [PATCH] Update headers

---
 .../calib3d/real_time_pose_estimation/src/RobustMatcher.h            | 1 -
 .../cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Utils.h  | 1 -
 .../calib3d/real_time_pose_estimation/src/main_detection.cpp         | 5 +----
 .../calib3d/real_time_pose_estimation/src/main_verification.cpp      | 5 +----
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/RobustMatcher.h b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/RobustMatcher.h
index fc03c74..1871aa4 100644
--- a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/RobustMatcher.h
+++ b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/RobustMatcher.h
@@ -9,7 +9,6 @@
 #define ROBUSTMATCHER_H_
 
 #include <iostream>
-#include <boost/shared_ptr.hpp>
 
 #include <opencv2/core/core.hpp>
 #include <opencv2/highgui/highgui.hpp>
diff --git a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Utils.h b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Utils.h
index d51eb28..36709e8 100644
--- a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Utils.h
+++ b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Utils.h
@@ -9,7 +9,6 @@
 #define UTILS_H_
 
 #include <iostream>
-#include <cv.h>
 
 #include "PnPProblem.h"
 
diff --git a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_detection.cpp b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_detection.cpp
index ff00e24..85272f9 100644
--- a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_detection.cpp
+++ b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_detection.cpp
@@ -1,9 +1,6 @@
 #include <iostream>
 #include <time.h>
 
-#include "cv.h"
-#include "highgui.h"
-
 #include <opencv2/core/core.hpp>
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
@@ -155,7 +152,7 @@ int main(int argc, char *argv[])
 
 
   // Create & Open Window
-  cv::namedWindow("REAL TIME DEMO", CV_WINDOW_KEEPRATIO);
+  cv::namedWindow("REAL TIME DEMO", cv::WINDOW_KEEPRATIO);
 
 
   cv::VideoCapture cap;                           // instantiate VideoCapture
diff --git a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_verification.cpp b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_verification.cpp
index 7545658..1b948be 100644
--- a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_verification.cpp
+++ b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_verification.cpp
@@ -1,8 +1,5 @@
 #include <iostream>
 
-#include "cv.h"
-#include "highgui.h"
-
 #include <opencv2/core/core.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/nonfree/features2d.hpp>
@@ -132,7 +129,7 @@ int main(int, char**)
   registration.setNumMax(n);
 
   // Create & Open Window
-  cv::namedWindow("MODEL GROUND TRUTH", CV_WINDOW_KEEPRATIO);
+  cv::namedWindow("MODEL GROUND TRUTH", cv::WINDOW_KEEPRATIO);
 
   // Set up the mouse events
   cv::setMouseCallback("MODEL GROUND TRUTH", onMouseModelVerification, 0 );
-- 
2.7.4