From 4e4fbc21900294279ce34a54bd7433860a58c176 Mon Sep 17 00:00:00 2001 From: curt Date: Sat, 4 Jul 1998 00:47:18 +0000 Subject: [PATCH] typedef'd struct fgBUCKET. --- DEM/dem.cxx | 11 ++++++++--- DEM/dem.hxx | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/DEM/dem.cxx b/DEM/dem.cxx index b76f183b1..b00a3016d 100644 --- a/DEM/dem.cxx +++ b/DEM/dem.cxx @@ -518,7 +518,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; @@ -648,7 +648,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); } @@ -678,7 +678,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 @@ -776,10 +776,15 @@ 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.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. diff --git a/DEM/dem.hxx b/DEM/dem.hxx index 31870b125..33eefc248 100644 --- a/DEM/dem.hxx +++ b/DEM/dem.hxx @@ -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,9 @@ 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. -- 2.39.2