projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a214c0
)
removed old headers
author
edgarriba
<edgar.riba@gmail.com>
Tue, 12 Aug 2014 15:22:35 +0000
(17:22 +0200)
committer
edgarriba
<edgar.riba@gmail.com>
Tue, 12 Aug 2014 15:22:35 +0000
(17:22 +0200)
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/RobustMatcher.h
patch
|
blob
|
history
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_registration.cpp
patch
|
blob
|
history
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
1871aa4
..
1a77b92
100644
(file)
--- 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
@@
-13,7
+13,6
@@
#include <opencv2/core/core.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/features2d/features2d.hpp>
-#include <opencv2/nonfree/nonfree.hpp>
class RobustMatcher {
public:
diff --git
a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_registration.cpp
b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_registration.cpp
index
be85951
..
baea3a5
100644
(file)
--- a/
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_registration.cpp
+++ b/
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_registration.cpp
@@
-5,7
+5,6
@@
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/calib3d/calib3d.hpp>
#include <opencv2/features2d/features2d.hpp>
-#include <opencv2/nonfree/features2d.hpp>
// PnP Tutorial
#include "Mesh.h"
#include "Model.h"