From 54b767543ee0544ef08ab20baf05ecd768dc88a9 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 24 Apr 2019 23:12:14 +0200 Subject: Revert "fixes issues 25 and 26" This reverts commit 1f84e1918c1f1ca57fa63f72b7c1f39c5c4563ac. --- src/mp-serializer.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mp-serializer.c b/src/mp-serializer.c index 2a5c3e3..560aa64 100644 --- a/src/mp-serializer.c +++ b/src/mp-serializer.c @@ -352,19 +352,14 @@ mp_cast_to_exponential_string(MpSerializer *serializer, const MPNumber *x, gbool gchar * mp_serializer_to_string(MpSerializer *serializer, const MPNumber *x) { - MPNumber cmp, xcmp; gchar *s0; int n_digits = 0; - mp_set_from_integer(10, &cmp); - mp_xpowy_integer(&cmp, -(serializer->priv->trailing_digits), &cmp); - mp_real_component(x, &xcmp); - mp_abs(&xcmp, &xcmp); + switch(serializer->priv->format) { default: case MP_DISPLAY_FORMAT_AUTOMATIC: s0 = mp_cast_to_string(serializer, x, &n_digits); - if ((n_digits <= serializer->priv->leading_digits && - mp_is_greater_equal(&xcmp, &cmp)) || mp_is_complex(x)) + if (n_digits <= serializer->priv->leading_digits) return s0; else { g_free (s0); -- cgit v1.2.1