diff options
author | Segher Boessenkool <segher@xiph.org> | 2001-12-21 14:52:36 +0000 |
---|---|---|
committer | Segher Boessenkool <segher@xiph.org> | 2001-12-21 14:52:36 +0000 |
commit | 9000e9345c6e8d89bf78a97713759b583b715202 (patch) | |
tree | 942bbb54383e2dfeab0942ec8d909e3e161c7f86 /lib/sharedbook.c | |
parent | 51b21ae55583525e37ddde7e6096c1717598e247 (diff) | |
download | libvorbis-git-9000e9345c6e8d89bf78a97713759b583b715202.tar.gz |
fix nasty warnings, and some non-ansi constructs. increase portability.
svn path=/trunk/vorbis/; revision=2881
Diffstat (limited to 'lib/sharedbook.c')
-rw-r--r-- | lib/sharedbook.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sharedbook.c b/lib/sharedbook.c index bf922a7a..4a57ea67 100644 --- a/lib/sharedbook.c +++ b/lib/sharedbook.c @@ -11,7 +11,7 @@ ******************************************************************** function: basic shared codebook operations - last mod: $Id: sharedbook.c,v 1.21 2001/12/20 01:00:30 segher Exp $ + last mod: $Id: sharedbook.c,v 1.22 2001/12/21 14:52:36 segher Exp $ ********************************************************************/ @@ -51,7 +51,7 @@ long _float32_pack(float val){ sign=0x80000000; val= -val; } - exp= floor(log(val)/log(2)); + exp= floor(log(val)/log(2.f)); mant=rint(ldexp(val,(VQ_FMAN-1)-exp)); exp=(exp+VQ_FEXP_BIAS)<<VQ_FMAN; @@ -197,7 +197,7 @@ decode_aux *_make_decode_tree(codebook *c){ that's portable and totally safe against roundoff, but I haven't thought of it. Therefore, we opt on the side of caution */ long _book_maptype1_quantvals(const static_codebook *b){ - long vals=floor(pow(b->entries,1.f/b->dim)); + long vals=floor(pow((float)b->entries,1.f/b->dim)); /* the above *should* be reliable, but we'll not assume that FP is ever reliable when bitstream sync is at stake; verify via integer |