fly/flightgear
1
0
Fork 0
Code Activity

Fixed a bug in the handling of exclude files which was causing

Browse source 
a crash by calling fclose() on an invalid file handle.
Removed overlapping offsets.
This commit is contained in:
curt 1998-09-09 16:24:51 +00:00
parent 757ecbfcfd
commit aa77cd6079
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
AssemTris/assemtris.c
View file

@ -36,6 +36,14 @@
#include <Bucket/bucketutils.h> #include <Bucket/bucketutils.h>
/*
#define OFFSET_LON 0.1
#define OFFSET_LAT 0.1
*/
#define OFFSET_LON 0.0
#define OFFSET_LAT 0.0
int nodecount = 0; int nodecount = 0;
int excount = 0; int excount = 0;
@ -123,8 +131,8 @@ void read_extra_nodes(char *exfile) {
printf("(extra) %d %.2f %.2f %.2f\n", printf("(extra) %d %.2f %.2f %.2f\n",
i, exnodes[i][0], exnodes[i][1], exnodes[i][2]); i, exnodes[i][0], exnodes[i][1], exnodes[i][2]);
} }
fclose(fd);
} }
fclose(fd);
} }
@ -403,35 +411,35 @@ void build_node_list(char *basename, char *basepath) {
read_extra_nodes(exfile); read_extra_nodes(exfile);
ne = my_open(basename, basepath, ".ne"); ne = my_open(basename, basepath, ".ne");
read_nodes(ne, 0.1, 0.1); read_nodes(ne, OFFSET_LON, OFFSET_LAT);
fclose(ne); fclose(ne);
nw = my_open(basename, basepath, ".nw"); nw = my_open(basename, basepath, ".nw");
read_nodes(nw, -0.1, 0.1); read_nodes(nw, -1.0 * OFFSET_LON, OFFSET_LAT);
fclose(nw); fclose(nw);
se = my_open(basename, basepath, ".se"); se = my_open(basename, basepath, ".se");
read_nodes(se, 0.1, -0.1); read_nodes(se, OFFSET_LON, -1.0 * OFFSET_LAT);
fclose(se); fclose(se);
sw = my_open(basename, basepath, ".sw"); sw = my_open(basename, basepath, ".sw");
read_nodes(sw, -0.1, -0.1); read_nodes(sw, -1.0 * OFFSET_LON, -1.0 * OFFSET_LAT);
fclose(sw); fclose(sw);
north = my_open(basename, basepath, ".north"); north = my_open(basename, basepath, ".north");
read_nodes(north, 0.0, 0.1); read_nodes(north, 0.0, OFFSET_LAT);
fclose(north); fclose(north);
south = my_open(basename, basepath, ".south"); south = my_open(basename, basepath, ".south");
read_nodes(south, 0.0, -0.1); read_nodes(south, 0.0, -1.0 * OFFSET_LAT);
fclose(south); fclose(south);
east = my_open(basename, basepath, ".east"); east = my_open(basename, basepath, ".east");
read_nodes(east, 0.1, 0.0); read_nodes(east, OFFSET_LON, 0.0);
fclose(east); fclose(east);
west = my_open(basename, basepath, ".west"); west = my_open(basename, basepath, ".west");
read_nodes(west, -0.1, 0.0); read_nodes(west, -1.0 * OFFSET_LON, 0.0);
fclose(west); fclose(west);
body = my_open(basename, basepath, ".body"); body = my_open(basename, basepath, ".body");
@ -531,9 +539,14 @@ int main(int argc, char **argv) {
/* $Log$ /* $Log$
/* Revision 1.11 1998/08/06 12:47:59 curt /* Revision 1.12 1998/09/09 16:24:51 curt
/* Removed overlap in tiles as a test. /* Fixed a bug in the handling of exclude files which was causing
/* a crash by calling fclose() on an invalid file handle.
/* Removed overlapping offsets.
/* /*
* Revision 1.11 1998/08/06 12:47:59 curt
* Removed overlap in tiles as a test.
*
* Revision 1.10 1998/07/21 04:34:20 curt * Revision 1.10 1998/07/21 04:34:20 curt
* Mods to handle extra nodes (i.e. preserve cutouts). * Mods to handle extra nodes (i.e. preserve cutouts).
* *