From 6bc80a4f213a398be0bf3c05d99c328f3f9f9bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Wed, 4 Sep 2019 10:37:44 +0200 Subject: [PATCH] [poincare] PrintFloat: remove never used addition. max(0, negative number) is always 0 --- poincare/src/print_float.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poincare/src/print_float.cpp b/poincare/src/print_float.cpp index c666b4588..c0bbcb802 100644 --- a/poincare/src/print_float.cpp +++ b/poincare/src/print_float.cpp @@ -19,7 +19,6 @@ extern "C" { namespace Poincare { static inline int minInt(int x, int y) { return x < y ? x : y; } -static inline int maxInt(int x, int y) { return x > y ? x : y; } PrintFloat::Long::Long(int64_t i) : m_negative(i < 0) @@ -242,14 +241,15 @@ int PrintFloat::ConvertFloatToTextPrivate(T f, char * buffer, int bufferSize, in if (exponentInBase10 >= 0) { numberOfCharsForMantissaWithoutSign = numberOfSignificantDigits; } else { + /* exponentInBase10 < 0, so we add |exponentInBase10| to count 0 added + * before significant digits */ numberOfCharsForMantissaWithoutSign = numberOfSignificantDigits - exponentInBase10; } } else if (mode == Preferences::PrintFloatMode::Scientific) { numberOfCharsForMantissaWithoutSign = numberOfSignificantDigits; } else { assert(mode == Preferences::PrintFloatMode::Engineering); - numberOfCharsForMantissaWithoutSign = numberOfSignificantDigits + maxInt(0, (numberOfSignificantDigits%3) - numberOfSignificantDigits + 1); - assert(numberOfCharsForMantissaWithoutSign <= numberOfSignificantDigits); + numberOfCharsForMantissaWithoutSign = numberOfSignificantDigits; } /* The number of digits in a mantissa is capped because the maximal int64_t is