summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-01-12 19:50:00 +0100
committerStanislaw Halik <sthalik@misaki.pl>2014-01-12 19:50:00 +0100
commit488198a4b440936a7fb7fc90c5527a32a0f0b249 (patch)
treedf6447de75e1e4cae0c4a61d8377294791215704
parentb83a47cb32443981ce9998b2015f7d310fb72821 (diff)
Revert "FINALLY fix d_order -> image pos"
This reverts commit 4bfda0171465193476cebb03373ae165ab9e67ab.
-rw-r--r--FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp3
-rw-r--r--FTNoIR_Tracker_PT/point_tracker.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
index c949b8d0..102f62ee 100644
--- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
+++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
@@ -85,7 +85,8 @@ void Tracker::run()
const std::vector<cv::Vec2f>& points = point_extractor.extract_points(frame, dt, true);
for (auto p : points)
{
- auto p2 = cv::Point(p[0] * frame.cols + frame.cols/2, -p[1] * frame.cols + frame.rows/2);
+ auto p2 = cv::Point(p[0] * frame.cols + frame.cols/2,
+ -p[1] * frame.cols + frame.rows/2);
cv::Scalar color(0, 255, 0);
cv::line(frame,
cv::Point(p2.x - 20, p2.y),
diff --git a/FTNoIR_Tracker_PT/point_tracker.cpp b/FTNoIR_Tracker_PT/point_tracker.cpp
index 96d9d972..faac9963 100644
--- a/FTNoIR_Tracker_PT/point_tracker.cpp
+++ b/FTNoIR_Tracker_PT/point_tracker.cpp
@@ -244,7 +244,7 @@ void PointTracker::POSIT(float fov, int w, int h)
for (int i = 0; i < 3; i++)
{
- auto p2 = cv::Point(p[i][0] * w + w/2, -p[i][1] * w + h/2);
+ auto p2 = cv::Point(p[i][0] * w + w/2, -p[i][1] * h + w/2);
img_points.push_back(p2);
}