From 395288135cd488e3163f6212e78dd18489c16713 Mon Sep 17 00:00:00 2001
From: Joan Sola <jsola@iri.upc.edu>
Date: Tue, 4 Jun 2019 18:42:14 +0200
Subject: [PATCH] Change API of unmarkKeyframe to accept a capture and not a
frame.
Only the capture's time stamp can be used to access the track's features.
---
include/core/processor/track_matrix.h | 2 +-
src/processor/track_matrix.cpp | 4 ++--
test/gtest_track_matrix.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/core/processor/track_matrix.h b/include/core/processor/track_matrix.h
index 7ccf8a73f..0be506eaa 100644
--- a/include/core/processor/track_matrix.h
+++ b/include/core/processor/track_matrix.h
@@ -102,7 +102,7 @@ class TrackMatrix
SizeStd numKeyframeTracks();
Track trackAtKeyframes(size_t _track_id);
bool markKeyframe(CaptureBasePtr _capture);
- bool unmarkKeyframe(FrameBasePtr _keyframe);
+ bool unmarkKeyframe(CaptureBasePtr _capture);
private:
diff --git a/src/processor/track_matrix.cpp b/src/processor/track_matrix.cpp
index 56e87f15e..9e385b519 100644
--- a/src/processor/track_matrix.cpp
+++ b/src/processor/track_matrix.cpp
@@ -247,10 +247,10 @@ bool TrackMatrix::markKeyframe(CaptureBasePtr _capture)
return false;
}
-bool TrackMatrix::unmarkKeyframe(FrameBasePtr _keyframe)
+bool TrackMatrix::unmarkKeyframe(CaptureBasePtr _capture)
{
bool removed = false;
- auto ts = _keyframe->getTimeStamp();
+ auto ts = _capture->getTimeStamp();
for (auto pair_id_trk : tracks_kf_)
{
if (pair_id_trk.second.erase(ts))
diff --git a/test/gtest_track_matrix.cpp b/test/gtest_track_matrix.cpp
index 1b84496eb..e9b3a620c 100644
--- a/test/gtest_track_matrix.cpp
+++ b/test/gtest_track_matrix.cpp
@@ -455,7 +455,7 @@ TEST_F(TrackMatrixTest, unmarkKeyframe)
ASSERT_EQ(track_matrix.numKeyframeTracks(), (unsigned int) 1);
F0->setNonEstimated();
- track_matrix.unmarkKeyframe(F0);
+ track_matrix.unmarkKeyframe(C0);
/* C0 C1 C2 C3 snapshots
*
* f0---f1---f2 trk 0
--
GitLab