Added #ifdef HAVE_CONFIG_H

[flightgear.git] / DEM / dem.cxx

diff --git a/DEM/dem.cxx b/DEM/dem.cxx
index 462013bf9b2bba1da70a41095337e9ac687199df..52612143a3166fe9bda1422159792c1dd750a901 100644 (file)
--- a/DEM/dem.cxx
+++ b/DEM/dem.cxx
@@ -24,6 +24,10 @@
 // (Log is kept at end of this file)
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <ctype.h>    // isspace()
 #include <math.h>     // rint()
 #include <stdio.h>
@@ -105,7 +109,7 @@ int fgDEM::open ( char *file ) {
        // fd = stdin;
        fd = gzdopen(STDIN_FILENO, "r");
     } else {
-       if ( (fd = gzopen(file, "r")) == NULL ) {
+       if ( (fd = gzopen(file, "rb")) == NULL ) {
            printf("Cannot gzopen %s\n", file);
            return(0);
        }
@@ -198,7 +202,7 @@ static int next_exp(gzFile fd) {
 
 
 // read and parse DEM "A" record
-void fgDEM::read_a_record( void ) {
+int fgDEM::read_a_record( void ) {
     int i, inum;
     double dnum;
     char name[144];
@@ -225,6 +229,10 @@ void fgDEM::read_a_record( void ) {
     inum = next_int(fd);
     printf("    DEM level code = %d\n", inum);
 
+    if ( inum > 3 ) {
+       return(0);
+    }
+
     // Pattern code, 1 indicates a regular elevation pattern
     inum = next_int(fd);
     printf("    Pattern code = %d\n", inum);
@@ -331,6 +339,8 @@ void fgDEM::read_a_record( void ) {
     // number of profiles
     dem_num_profiles = cols = next_int(fd);
     printf("    Expecting %d profiles\n", dem_num_profiles);
+
+    return(1);
 }
 
 
@@ -375,9 +385,11 @@ void fgDEM::read_b_record( void ) {
 int fgDEM::parse( void ) {
     int i;
 
-    cur_row = 0;
+    cur_col = 0;
 
-    read_a_record();
+    if ( !read_a_record() ) {
+       return(0);
+    }
 
     for ( i = 0; i < dem_num_profiles; i++ ) {
        // printf("Ready to read next b record\n");
@@ -391,7 +403,7 @@ int fgDEM::parse( void ) {
 
     printf("    Done parsing\n");
 
-    return(0);
+    return(1);
 }
 
 
@@ -510,7 +522,7 @@ double fgDEM::interpolate_altitude( double lon, double lat ) {
 
 
 // Use least squares to fit a simpler data set to dem data
-void fgDEM::fit( char *fg_root, double error, struct fgBUCKET *p ) {
+void fgDEM::fit( double error, fgBUCKET *p ) {
     double x[DEM_SIZE_1], y[DEM_SIZE_1];
     double m, b, ave_error, max_error;
     double cury, lasty;
@@ -640,7 +652,7 @@ void fgDEM::fit( char *fg_root, double error, struct fgBUCKET *p ) {
        // printf("Please hit return: "); gets(junk);
     }
 
-    outputmesh_output_nodes(fg_root, p);
+    // outputmesh_output_nodes(fg_root, p);
 }
 
 
@@ -670,7 +682,7 @@ void fgDEM::outputmesh_set_pt( int i, int j, double value ) {
 
 
 // Write out a node file that can be used by the "triangle" program
-void fgDEM::outputmesh_output_nodes( char *fg_root, struct fgBUCKET *p ) {
+void fgDEM::outputmesh_output_nodes( char *fg_root, fgBUCKET *p ) {
     struct stat stat_buf;
     char base_path[256], dir[256], file[256];
 #ifdef WIN32
@@ -768,10 +780,28 @@ void fgDEM::outputmesh_output_nodes( char *fg_root, struct fgBUCKET *p ) {
 
 fgDEM::~fgDEM( void ) {
     // printf("class fgDEM DEstructor called.\n");
+    free(dem_data);
+    free(output_data);
 }
 
 
 // $Log$
+// Revision 1.9  1998/07/13 15:29:49  curt
+// Added #ifdef HAVE_CONFIG_H
+//
+// Revision 1.8  1998/07/04 00:47:18  curt
+// typedef'd struct fgBUCKET.
+//
+// Revision 1.7  1998/06/05 18:14:39  curt
+// Abort out early when reading the "A" record if it doesn't look like
+// a proper DEM file.
+//
+// Revision 1.6  1998/05/02 01:49:21  curt
+// Fixed a bug where the wrong variable was being initialized.
+//
+// Revision 1.5  1998/04/25 15:00:32  curt
+// Changed "r" to "rb" in gzopen() options.  This fixes bad behavior in win32.
+//
 // Revision 1.4  1998/04/22 13:14:46  curt
 // Fixed a bug in zlib usage.
 //