Merging the postbeta2 branch onto the mainline.

[platform/upstream/libvorbis.git] / lib / scales.h

diff --git a/lib/scales.h b/lib/scales.h
index 54ab4ea..9d48ebb 100644 (file)
--- a/lib/scales.h
+++ b/lib/scales.h
@@ -12,7 +12,7 @@
  ********************************************************************
 
  function: linear scale -> dB, Bark and Mel scales
- last mod: $Id: scales.h,v 1.5 2000/06/14 01:38:32 xiphmont Exp $
+ last mod: $Id: scales.h,v 1.6 2000/10/12 03:12:54 xiphmont Exp $
 
  ********************************************************************/
 
@@ -23,7 +23,8 @@
 
 /* 20log10(x) */
 #define DYNAMIC_RANGE_dB 200.
-#define todB(x)   ((x)==0?-9.e40:log(fabs(x))*8.6858896)
+#define todB(x)   ((x)==0?-9.e38:log(fabs(x))*8.6858896)
+#define todB_nn(x)   ((x)==0?-9.e38:log(x)*8.6858896)
 #define fromdB(x) (exp((x)*.11512925))