Fixed a bug in zlib usage.
This commit is contained in:
parent
d365ac9aff
commit
18ae70b3b1
2 changed files with 12 additions and 6 deletions
11
DEM/dem.cxx
11
DEM/dem.cxx
|
@ -125,7 +125,7 @@ int fgDEM::close ( void ) {
|
||||||
|
|
||||||
|
|
||||||
// return next token from input stream
|
// return next token from input stream
|
||||||
static void next_token(gzFile *fd, char *token) {
|
static void next_token(gzFile fd, char *token) {
|
||||||
int i, result;
|
int i, result;
|
||||||
char c;
|
char c;
|
||||||
|
|
||||||
|
@ -152,7 +152,7 @@ static void next_token(gzFile *fd, char *token) {
|
||||||
|
|
||||||
|
|
||||||
// return next integer from input stream
|
// return next integer from input stream
|
||||||
static int next_int(gzFile *fd) {
|
static int next_int(gzFile fd) {
|
||||||
char token[80];
|
char token[80];
|
||||||
|
|
||||||
next_token(fd, token);
|
next_token(fd, token);
|
||||||
|
@ -161,7 +161,7 @@ static int next_int(gzFile *fd) {
|
||||||
|
|
||||||
|
|
||||||
// return next double from input stream
|
// return next double from input stream
|
||||||
static double next_double(gzFile *fd) {
|
static double next_double(gzFile fd) {
|
||||||
char token[80];
|
char token[80];
|
||||||
|
|
||||||
next_token(fd, token);
|
next_token(fd, token);
|
||||||
|
@ -170,7 +170,7 @@ static double next_double(gzFile *fd) {
|
||||||
|
|
||||||
|
|
||||||
// return next exponential num from input stream
|
// return next exponential num from input stream
|
||||||
static int next_exp(gzFile *fd) {
|
static int next_exp(gzFile fd) {
|
||||||
char token[80];
|
char token[80];
|
||||||
double mantissa;
|
double mantissa;
|
||||||
int exp, acc;
|
int exp, acc;
|
||||||
|
@ -772,6 +772,9 @@ fgDEM::~fgDEM( void ) {
|
||||||
|
|
||||||
|
|
||||||
// $Log$
|
// $Log$
|
||||||
|
// Revision 1.4 1998/04/22 13:14:46 curt
|
||||||
|
// Fixed a bug in zlib usage.
|
||||||
|
//
|
||||||
// Revision 1.3 1998/04/18 03:53:05 curt
|
// Revision 1.3 1998/04/18 03:53:05 curt
|
||||||
// Added zlib support.
|
// Added zlib support.
|
||||||
//
|
//
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
class fgDEM {
|
class fgDEM {
|
||||||
// file pointer for input
|
// file pointer for input
|
||||||
gzFile *fd;
|
gzFile fd;
|
||||||
|
|
||||||
// coordinates (in arc seconds) of south west corner
|
// coordinates (in arc seconds) of south west corner
|
||||||
double originx, originy;
|
double originx, originy;
|
||||||
|
@ -79,7 +79,7 @@ class fgDEM {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
// Constructor (opens a DEM file)
|
// Constructor
|
||||||
fgDEM( void );
|
fgDEM( void );
|
||||||
|
|
||||||
// open a DEM file (use "-" if input is coming from stdin)
|
// open a DEM file (use "-" if input is coming from stdin)
|
||||||
|
@ -130,6 +130,9 @@ public:
|
||||||
|
|
||||||
|
|
||||||
// $Log$
|
// $Log$
|
||||||
|
// 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
|
// Revision 1.4 1998/04/21 17:03:41 curt
|
||||||
// Prepairing for C++ integration.
|
// Prepairing for C++ integration.
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in a new issue