[xiph-cvs] cvs commit: vorbis/lib os.h psy.c

[Segher Boessenkool]

segher      02/03/17 19:30:24

  Modified:    lib      os.h psy.c
  Log:
  #define floor floorf  , if it exists.  Don't use floorf() directly.

Revision  Changes    Path
1.29      +4 -1      vorbis/lib/os.h

Index: os.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/os.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- os.h	2001/12/19 01:08:14	1.28
+++ os.h	2002/03/18 03:30:23	1.29
@@ -13,7 +13,7 @@
  ********************************************************************
 
  function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os.h,v 1.28 2001/12/19 01:08:14 xiphmont Exp $
+ last mod: $Id: os.h,v 1.29 2002/03/18 03:30:23 segher Exp $
 
  ********************************************************************/
 
@@ -62,6 +62,9 @@
 #endif
 #ifdef HAVE_RINTF
 #  define rint rintf
+#endif
+#ifdef HAVE_FLOORF
+#  define floor floorf
 #endif
 
 #ifndef FAST_HYPOT

<p><p>1.66      +2 -2      vorbis/lib/psy.c

Index: psy.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/psy.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- psy.c	2002/03/17 19:50:47	1.65
+++ psy.c	2002/03/18 03:30:23	1.66
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: psychoacoustics not including preecho
- last mod: $Id: psy.c,v 1.65 2002/03/17 19:50:47 xiphmont Exp $
+ last mod: $Id: psy.c,v 1.66 2002/03/18 03:30:23 segher Exp $
 
  ********************************************************************/
 
@@ -923,7 +923,7 @@
     }
     
     corr=origmag/FAST_HYPOT(fA,fB);
-    *mag=unitnorm(*mag)*floorf(corr*igranule+.5f)*granule; 
+    *mag=unitnorm(*mag)*floor(corr*igranule+.5f)*granule; 
     *ang=0.f;
 
   }else{

<p><p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.