r4123: Auto commit for Debian build

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index dd98f6b1ae70a604ebec63a823f6be10173b79e4..90bb1b358eda0949e9c24a581b0c9338599926dd 100644 (file)
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -8,7 +8,7 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id: wdq2wav.cpp,v 1.22 2003/02/25 18:15:06 kevin Exp $
+**  $Id: wdq2wav.cpp,v 1.23 2003/02/25 18:18:45 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -26,7 +26,7 @@
 
 #include <wdq2wav.h>
 
-const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.22 2003/02/25 18:15:06 kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.23 2003/02/25 18:18:45 kevin Exp $";
 
 bool g_quiet = false;
 bool g_verbose = false;
@@ -509,7 +509,7 @@ WindaqChannel::read_channel_data ()
   m_min_scaled_data = (m_slope * data_min) + m_intercept;
 
   if (g_demean) {
-    double dmean = total_data / static_cast<double> wdq.m_nSamples;
+    double dmean = total_data / static_cast<double>(wdq.m_nSamples);
     int mean = nearest<int>(dmean);
     for (i = 0; i < r_wdq.m_nSamples; i++)
       m_data[i] -= mean;

diff --git a/wdq2wav.h b/wdq2wav.h
index 79201361dfa04cc8f7efad8c5d881b98341e41fd..5dd00ceb8123fe0bc2a7222515bc75ed01d4af3f 100644 (file)
--- a/wdq2wav.h
+++ b/wdq2wav.h
@@ -8,7 +8,7 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id: wdq2wav.h,v 1.14 2003/02/25 18:15:52 kevin Exp $
+**  $Id: wdq2wav.h,v 1.15 2003/02/25 18:18:26 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -132,6 +132,7 @@ class WavFile
   bool fill_header();
 };
 
+template<class T>
 inline T nearest (double x)
 {
   return (x > 0 ?