diff options
author | Justin Berger <j.david.berger@gmail.com> | 2018-03-15 23:39:30 -0600 |
---|---|---|
committer | Justin Berger <j.david.berger@gmail.com> | 2018-03-15 23:39:30 -0600 |
commit | b0c70158e8c2c7d2826368a2808c2a594f422821 (patch) | |
tree | f3b307877df8ed8f0fbb27ef4680304f4d761a1c /src | |
parent | 6e67cc1996fbcba36e11cb281c78d3b00c4de85d (diff) | |
download | libsurvive-b0c70158e8c2c7d2826368a2808c2a594f422821.tar.gz libsurvive-b0c70158e8c2c7d2826368a2808c2a594f422821.tar.bz2 |
Quick fix for merge issue
Diffstat (limited to 'src')
-rw-r--r-- | src/persistent_scene.c | 2 | ||||
-rw-r--r-- | src/poser_epnp.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/persistent_scene.c b/src/persistent_scene.c index 9bbbf41..cfc389f 100644 --- a/src/persistent_scene.c +++ b/src/persistent_scene.c @@ -21,7 +21,7 @@ void PersistentScene_add(PersistentScene *self, SurviveObject *so, PoserDataLigh void PersistentScene_ForEachCorrespondence(PersistentScene *self, PersistentScene_ForEachCorrespondence_fn fn, SurviveObject *so, uint32_t timecode_now, void *user) { for (int lh = 0; lh < NUM_LIGHTHOUSES; lh++) { - for (size_t i = 0; i < so->nr_locations; i++) { + for (size_t i = 0; i < so->sensor_ct; i++) { if (PersistentScene_isStillValid(self, timecode_now, i, lh)) { double *pts = self->angles[i][lh]; fn(so, lh, i, pts, user); diff --git a/src/poser_epnp.c b/src/poser_epnp.c index 7749c7b..e416456 100644 --- a/src/poser_epnp.c +++ b/src/poser_epnp.c @@ -64,9 +64,9 @@ static int opencv_solver_fullscene(SurviveObject *so, PoserDataFullScene *pdfs) for (int lh = 0; lh < 2; lh++) { epnp pnp = {.fu = 1, .fv = 1}; - epnp_set_maximum_number_of_correspondences(&pnp, so->nr_locations); + epnp_set_maximum_number_of_correspondences(&pnp, so->sensor_ct); - for (size_t i = 0; i < so->nr_locations; i++) { + for (size_t i = 0; i < so->sensor_ct; i++) { FLT *lengths = pdfs->lengths[i][lh]; FLT *ang = pdfs->angles[i][lh]; if (lengths[0] < 0 || lengths[1] < 0) @@ -121,7 +121,7 @@ int PoserEPNP(SurviveObject *so, PoserData *pd) { int lh = lightData->lh; if (so->ctx->bsd[lh].PositionSet) { epnp pnp = {.fu = 1, .fv = 1}; - epnp_set_maximum_number_of_correspondences(&pnp, so->nr_locations); + epnp_set_maximum_number_of_correspondences(&pnp, so->sensor_ct); struct add_correspondence_for_lh user = {.lh = lh, .pnp = &pnp}; PersistentScene_ForEachCorrespondence(scene, add_correspondence_for_lh, so, lightData->timecode, &user); |