r4019: *** empty log message ***

[wdq2wav.git] / wdq2wav.cpp

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index 392a108d71835413badb9c84afa4f56a66cd6133..288a9c6c0e14e67b8357e567eecdd2000559e8de 100644 (file)
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -8,7 +8,7 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id: wdq2wav.cpp,v 1.15 2003/02/12 06:10:19 kevin Exp $
+**  $Id: wdq2wav.cpp,v 1.16 2003/02/12 07:24:32 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,17 +26,35 @@
 
 #include <wdq2wav.h>
 
-const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.15 2003/02/12 06:10:19 kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.16 2003/02/12 07:24:32 kevin Exp $";
 
 bool g_quiet = false;
 bool g_verbose = false;
 bool g_debug = false;
 
+
+#ifdef WIN32
+#define lseek _lseek
+#define close _close
+#define open _open
+#define read _read
+#define write _write
+#define O_BINARY _O_BINARY
+#define O_RDONLY _O_RDONLY
+#define O_WRONLY _O_WRONLY
+#define O_RDWR _O_RDRW
+#define O_TRUNC _O_TRUNC
+#define O_CREAT _O_CREAT
+const int g_fileMode = _S_IWRITE | _S_IREAD;
+struct fpos_t std::_Fpz = {0,0};
+#else
+const int g_fileMode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
 // Define as NULL for non-Windows platforms
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
-
+#endif
+ 
 
 void
 error_msg (const char *msg)
@@ -66,7 +84,7 @@ fileBasename (const char* filename)
 char *
 str_rm_tail (char *str, const char* const charlist)
 {
-  int i;
+  size_t i;
 
   for (i = strlen(str) - 1; i >= 0; i--)
     if (strchr (charlist, str[i]) != NULL)
@@ -438,18 +456,19 @@ WindaqChannel::read_channel_data ()
   m_units = units;
  
   unsigned int row_bytes = 2 * r_wdq.m_nChannels;
-  signed short int sample_row [row_bytes];
+  signed short int *sample_row = new signed short int [row_bytes];
   
   signed short int* psample = &sample_row[m_channel - 1];
 
   lseek (fd, r_wdq.m_nHeader_bytes, SEEK_SET);
-  long int i;
+  unsigned long int i;
   signed short int data_max, data_min;
   for (i = 0; i < r_wdq.m_nSamples; i++) {
     if (read (fd, sample_row, row_bytes) != row_bytes) {
       std::ostringstream os;
       os << "Error reading file at " << i;
       error_msg (os.str().c_str());
+      delete sample_row;
       return false;
     }
     signed short int v = *psample;
@@ -478,6 +497,7 @@ WindaqChannel::read_channel_data ()
   m_max_scaled_data = (m_slope * data_max) + m_intercept;
   m_min_scaled_data = (m_slope * data_min) + m_intercept;
 
+  delete sample_row;
   return true;
 }
 
@@ -519,7 +539,7 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname)
     if (! fill_header ())
       return;
 
-    long int i;
+    unsigned long int i;
     for (i = 0; i < m_nSamples; i++) {
       double value = input[i];
       value = (slope * value) + intercept;
@@ -613,8 +633,7 @@ WavFile::WriteFile ()
     return false;
 
   if (m_fd == 0)
-    if ((m_fd = open (m_strFile.c_str(), O_WRONLY | O_BINARY | O_TRUNC | O_CREAT, 
-                     S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) == 0) {
+    if ((m_fd = open (m_strFile.c_str(), O_WRONLY | O_BINARY | O_TRUNC | O_CREAT, g_fileMode)) == 0) {
       std::ostringstream os;
       os << "Error opening output file " << m_strFile.c_str();
       error_msg (os.str().c_str());