From e4d4a2d8eb176c5c86c961730daef1280d60e790 Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 13 May 1998 18:24:25 +0000 Subject: [PATCH] Wrapped zlib calls so zlib can be optionally disabled. --- Math/interpolater.cxx | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Math/interpolater.cxx b/Math/interpolater.cxx index 62006361..c77529e5 100644 --- a/Math/interpolater.cxx +++ b/Math/interpolater.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include "interpolater.hxx" @@ -35,23 +35,23 @@ // Constructor -- loads the interpolation table from the specified // file fgINTERPTABLE::fgINTERPTABLE( char *file ) { - char gzfile[256], line[256]; - gzFile fd; + char fgfile[256], line[256]; + fgFile 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, "rb")) == NULL ) { + strcpy(fgfile, file); + strcat(fgfile, ".gz"); + if ( (fd = fgopen(fgfile, "rb")) == NULL ) { // Next try "path" - if ( (fd = gzopen(file, "rb")) == NULL ) { + if ( (fd = fgopen(file, "rb")) == NULL ) { fgPrintf(FG_MATH, FG_EXIT, "Cannot open file: %s\n", file); } } size = 0; - while ( gzgets(fd, line, 250) != NULL ) { + while ( fggets(fd, line, 250) != NULL ) { if ( size < MAX_TABLE_SIZE ) { sscanf(line, "%lf %lf\n", &(table[size][0]), &(table[size][1])); size++; @@ -62,7 +62,7 @@ fgINTERPTABLE::fgINTERPTABLE( char *file ) { } } - gzclose(fd); + fgclose(fd); } @@ -107,6 +107,9 @@ fgINTERPTABLE::~fgINTERPTABLE( void ) { // $Log$ +// 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. // -- 2.39.5