IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-12-01 13:09:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace pow(10, foo) with array dereference

Browse Source 
Aside from being much faster, Windows was occasionally returning
e.g. 99 instead of 100 for pow(10, 2).  This stops that and thus
fixes:
Bug 721447 - Entries with values of ,50 are imported as ,51
Bug 721825 - Online prices displayed as unreadable fractions in 2.6.0

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23720 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls 2014-01-19 21:22:01 +00:00
parent fce049060e
commit 56d4392d9d
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/libqof/qof/gnc-numeric.c
View File

@ -26,11 +26,6 @@
#include <glib.h>
#include <math.h>
#if defined(G_OS_WIN32) && !defined(_MSC_VER)
# ifdef HAVE_POW_H
# include <pow.h>
# endif
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -44,6 +39,19 @@
#include "qofmath128.c"
/* static short module = MOD_ENGINE; */
static const gint64 pten[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
10000000, 100000000, 1000000000, 10000000000,
100000000000, 1000000000000, 10000000000000,
100000000000000, 10000000000000000};
#define POWTEN_OVERFLOW -5
static inline gint64
powten (int exp)
{
if (exp > 16 || exp < -16)
return POWTEN_OVERFLOW;
return exp < 0 ? -pten[-exp] : pten[exp];
}
gint64
pwr64 (gint64 op, int exp)
@ -819,18 +827,9 @@ gnc_numeric_convert(gnc_numeric in, gint64 denom, gint how)
}
sigfigs = GNC_HOW_GET_SIGFIGS(how);
if (fabs(sigfigs - logratio) > 18)
if ((denom = powten (sigfigs - logratio)) == POWTEN_OVERFLOW)
return gnc_numeric_error(GNC_ERROR_OVERFLOW);
if (sigfigs - logratio >= 0)
{
denom = (gint64)(pow(10, sigfigs - logratio));
}
else
{
denom = -((gint64)(pow(10, logratio - sigfigs)));
}
how = how & ~GNC_HOW_DENOM_SIGFIG & ~GNC_NUMERIC_SIGFIGS_MASK;
break;
@ -1153,7 +1152,6 @@ gnc_numeric_to_decimal(gnc_numeric *a, guint8 *max_decimal_places)
#ifdef _MSC_VER
# define rint /* */
#endif
gnc_numeric
double_to_gnc_numeric(double in, gint64 denom, gint how)
{
@ -1177,14 +1175,8 @@ double_to_gnc_numeric(double in, gint64 denom, gint how)
(floor(logval) + 1.0) : (ceil(logval)));
}
sigfigs = GNC_HOW_GET_SIGFIGS(how);
if (sigfigs - logval >= 0)
{
denom = (gint64)(pow(10, sigfigs - logval));
}
else
{
denom = -((gint64)(pow(10, logval - sigfigs)));
}
if ((denom = powten (sigfigs - logval)) == POWTEN_OVERFLOW)
return gnc_numeric_error(GNC_ERROR_OVERFLOW);
how = how & ~GNC_HOW_DENOM_SIGFIG & ~GNC_NUMERIC_SIGFIGS_MASK;
}