FreeBSD support.

[simgear.git] / Math / interpolater.cxx

diff --git a/Math/interpolater.cxx b/Math/interpolater.cxx
index 5c552a4e052fd7452c546777593273b7575d7a97..394de5a8dd360f047a15f25a929e6d11b788f4d9 100644 (file)
--- a/Math/interpolater.cxx
+++ b/Math/interpolater.cxx
@@ -24,45 +24,41 @@
 // (Log is kept at end of this file)
 
 
-#include <string.h>
+#include <string>
 
-#include <Debug/fg_debug.h>
-#include <zlib/zlib.h>
+#include <Debug/logstream.hxx>
+#include <Include/fg_zlib.h>
+#include <Misc/fgstream.hxx>
 
 #include "interpolater.hxx"
 
 
 // Constructor -- loads the interpolation table from the specified
 // file
-fgINTERPTABLE::fgINTERPTABLE( char *file ) {
-    char gzfile[256], line[256];
-    gzFile fd;
-
-    fgPrintf( FG_MATH, FG_INFO, "Initializing Interpolator for %s\n", file);
-
-    // First try "file.gz"
-    strcpy(gzfile, file);
-    strcat(gzfile, ".gz");
-    if ( (fd = gzopen(gzfile, "r")) == NULL ) {
-        // Next try "path"
-        if ( (fd = gzopen(file, "r")) == NULL ) {
-            fgPrintf(FG_MATH, FG_ALERT, "Cannot open file: %s\n", file);
-        }
+fgINTERPTABLE::fgINTERPTABLE( const string& file ) {
+    string fgfile, line;
+
+    FG_LOG( FG_MATH, FG_INFO, "Initializing Interpolator for " << file );
+
+    fg_gzifstream in( file );
+    if ( !in ) {
+        FG_LOG( FG_GENERAL, FG_ALERT, "Cannot open file: " << file );
+       exit(-1);
     }
 
     size = 0;
-    while ( gzgets(fd, line, 250) != NULL ) {
+    in >> skipcomment;
+    while ( ! in.eof() ){
        if ( size < MAX_TABLE_SIZE ) {
-           sscanf(line, "%lf %lf\n", &(table[size][0]), &(table[size][1]));
+           in >> table[size][0] >> table[size][1];
            size++;
        } else {
-            fgPrintf( FG_MATH, FG_ALERT, 
-                     "fgInterpolateInit(): Exceed max table size = %d\n",
-                     MAX_TABLE_SIZE );
+            FG_LOG( FG_MATH, FG_ALERT,
+                   "fgInterpolateInit(): Exceed max table size = "
+                   << MAX_TABLE_SIZE );
+           exit(-1);
        }
     }
-
-    gzclose(fd);
 }
 
 
@@ -77,17 +73,17 @@ double fgINTERPTABLE::interpolate(double x) {
        i++;
     }
 
-    printf ("i = %d ", i);
+    // printf ("i = %d ", i);
 
     if ( (i == 0) && (x < table[0][0]) ) {
-       fgPrintf( FG_MATH, FG_ALERT, 
-                 "fgInterpolateInit(): lookup error, x to small = %.2f\n", x);
+       FG_LOG( FG_MATH, FG_ALERT, 
+               "fgInterpolateInit(): lookup error, x to small = " << x );
        return(0.0);
     }
 
     if ( x > table[i][0] ) {
-       fgPrintf( FG_MATH, FG_ALERT, 
-                 "fgInterpolateInit(): lookup error, x to big = %.2f\n",  x);
+       FG_LOG( FG_MATH, FG_ALERT, 
+               "fgInterpolateInit(): lookup error, x to big = " << x );
        return(0.0);
     }
 
@@ -107,10 +103,23 @@ fgINTERPTABLE::~fgINTERPTABLE( void ) {
 
 
 // $Log$
+// Revision 1.5  1998/11/06 21:17:27  curt
+// Converted to new logstream debugging facility.  This allows release
+// builds with no messages at all (and no performance impact) by using
+// the -DFG_NDEBUG flag.
+//
+// Revision 1.4  1998/05/13 18:24:25  curt
+// Wrapped zlib calls so zlib can be optionally disabled.
+//
+// Revision 1.3  1998/04/25 15:05:01  curt
+// Changed "r" to "rb" in gzopen() options.  This fixes bad behavior in win32.
+//
+// Revision 1.2  1998/04/22 13:18:10  curt
+// C++ - ified comments.  Make file open errors fatal.
+//
 // Revision 1.1  1998/04/21 19:14:23  curt
 // Modified Files:
 //     Makefile.am Makefile.in
 // Added Files:
 //     interpolater.cxx interpolater.hxx
 //
-//