diff options
author | Abhijeet Vhotkar <abhijeetvhotkar@gmail.com> | 2018-03-10 18:16:29 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-10 18:16:29 -0500 |
commit | 9a34826efbab3d5fa9dbb9cf837c392395c7ef79 (patch) | |
tree | 6011fe431de4393c9212b4d5db78759080d65509 /src/poser_octavioradii.c | |
parent | e5a9bff729fb0c596daed5cdf45683e11c666766 (diff) | |
parent | c687e3ea63a5d974fd35feb07fe7fb87d4375e6a (diff) | |
download | libsurvive-9a34826efbab3d5fa9dbb9cf837c392395c7ef79.tar.gz libsurvive-9a34826efbab3d5fa9dbb9cf837c392395c7ef79.tar.bz2 |
Merge pull request #1 from cnlohr/master
Pulling new changes
Diffstat (limited to 'src/poser_octavioradii.c')
-rw-r--r-- | src/poser_octavioradii.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/poser_octavioradii.c b/src/poser_octavioradii.c index 0d8674c..5805e1a 100644 --- a/src/poser_octavioradii.c +++ b/src/poser_octavioradii.c @@ -252,7 +252,7 @@ static void normalizeAndMultiplyVector(FLT *vectorToNormalize, size_t count, FLT } -static RefineEstimateUsingGradientDescentRadii(FLT *estimateOut, SensorAngles *angles, FLT *initialEstimate, size_t numRadii, PointPair *pairs, size_t numPairs, FILE *logFile) +static void RefineEstimateUsingGradientDescentRadii(FLT *estimateOut, SensorAngles *angles, FLT *initialEstimate, size_t numRadii, PointPair *pairs, size_t numPairs, FILE *logFile) { int i = 0; FLT lastMatchFitness = calculateFitness(angles, initialEstimate, pairs, numPairs); @@ -521,9 +521,9 @@ static void QuickPose(SurviveObject *so) if (sensorCount > 4) { - FLT pos[3]; + Point pos; FLT orient[4]; - SolveForLighthouseRadii(pos, orient, to); + SolveForLighthouseRadii(&pos, orient, to); } @@ -591,7 +591,7 @@ int PoserOctavioRadii( SurviveObject * so, PoserData * pd ) } else { - dd->hitCount[i][l->lh][axis] *= 0.5; + dd->hitCount[i][l->lh][axis] = (int)((double)dd->hitCount[i][l->lh][axis] * 0.5); } } //if (0 == l->lh) |