From fdc8af2d34c27a02b78e968e6d5bbeb8a620ddb0 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 14 Jul 2017 09:47:31 +0200 Subject: [PATCH] FIT: let getScaleForExtraNative() return a float directly The caller wants a float anyway, so get rid of the cast and allow non integral values. --- src/FileIO/FitRideFile.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FileIO/FitRideFile.cpp b/src/FileIO/FitRideFile.cpp index 23d34a75e..041b3a19f 100644 --- a/src/FileIO/FitRideFile.cpp +++ b/src/FileIO/FitRideFile.cpp @@ -515,14 +515,14 @@ struct FitFileReaderState } } - int getScaleForExtraNative(int native_num) { + float getScaleForExtraNative(int native_num) { switch (native_num) { case 47: // COMBINED_PEDAL_SMOOTHNES - return 2; + return 2.0; default: - return 1; + return 1.0; } } @@ -1544,7 +1544,7 @@ struct FitFileReaderState idx = record_extra_fields[field.num]; if (idx>-1) { - int scale = getScaleForExtraNative(field.num); + float scale = getScaleForExtraNative(field.num); int offset = getOffsetForExtraNative(field.num); if (p_extra == NULL && @@ -1554,8 +1554,8 @@ struct FitFileReaderState p_extra = new XDataPoint(); switch (_values.type) { - case SingleValue: p_extra->number[idx]=_values.v/(float)scale+offset; break; - case FloatValue: p_extra->number[idx]=_values.f/(float)scale+offset; break; + case SingleValue: p_extra->number[idx]=_values.v/scale+offset; break; + case FloatValue: p_extra->number[idx]=_values.f/scale+offset; break; case StringValue: p_extra->string[idx]=_values.s.c_str(); break; default: break; }