When outputing to a .node file, first check for an optional

[flightgear.git] / DEM / dem.hxx

diff --git a/DEM/dem.hxx b/DEM/dem.hxx
index 4a84871d27c0deb5ec5de43374a858572eab9e03..33eefc248e9f4e49f1653e67759849f38db8bcc3 100644 (file)
--- a/DEM/dem.hxx
+++ b/DEM/dem.hxx
@@ -45,7 +45,7 @@
 
 class fgDEM {
     // file pointer for input
-    gzFile *fd;
+    gzFile fd;
 
     // coordinates (in arc seconds) of south west corner
     double originx, originy;
@@ -79,7 +79,7 @@ class fgDEM {
 
 public:
 
-    // Constructor (opens a DEM file)
+    // Constructor
     fgDEM( void );
 
     // open a DEM file (use "-" if input is coming from stdin)
@@ -92,7 +92,7 @@ public:
     int parse( void );
 
     // read and parse DEM "A" record
-    void read_a_record( void );
+    int read_a_record( void );
 
     // read and parse DEM "B" record
     void read_b_record( void );
@@ -107,7 +107,7 @@ public:
     double interpolate_altitude( double lon, double lat );
 
     // Use least squares to fit a simpler data set to dem data
-    void fit( char *fg_root, double error, struct fgBUCKET *p );
+    void fit( double error, fgBUCKET *p );
 
     // Initialize output mesh structure
     void outputmesh_init( void );
@@ -119,7 +119,7 @@ public:
     void outputmesh_set_pt( int i, int j, double value );
 
     // Write out a node file that can be used by the "triangle" program
-    void outputmesh_output_nodes( char *fg_root, struct fgBUCKET *p );
+    void outputmesh_output_nodes( char *fg_root, fgBUCKET *p );
 
     // Destructor
     ~fgDEM( void );
@@ -130,6 +130,16 @@ public:
 
 
 // $Log$
+// Revision 1.7  1998/07/04 00:47:19  curt
+// typedef'd struct fgBUCKET.
+//
+// Revision 1.6  1998/06/05 18:14:40  curt
+// Abort out early when reading the "A" record if it doesn't look like
+// a proper DEM file.
+//
+// Revision 1.5  1998/04/22 13:14:46  curt
+// Fixed a bug in zlib usage.
+//
 // Revision 1.4  1998/04/21 17:03:41  curt
 // Prepairing for C++ integration.
 //