From d2919ece4d0f9e8a9619ad6a6092863ebbd0cc27 Mon Sep 17 00:00:00 2001 From: Gareth Evans Date: Thu, 1 Jun 2017 18:56:01 +0100 Subject: [PATCH] Clear out dead tile loading code --- inputs.cc | 69 ------------------------------------------------------- 1 file changed, 69 deletions(-) diff --git a/inputs.cc b/inputs.cc index e52f94a..e7ef294 100644 --- a/inputs.cc +++ b/inputs.cc @@ -286,75 +286,6 @@ int loadLIDAR(char *filenames) // reset the IPPD after allocations IPPD -= 50; - /* Load the data into the global dem array */ - // for (size_t indx = 0; indx < fc; indx++) { - // dem[indx].max_north = tiles[indx].yur; - // dem[indx].min_west = tiles[indx].xur; - // dem[indx].min_north = tiles[indx].yll; - // dem[indx].max_west = tiles[indx].xll; - // dem[indx].max_el = tiles[indx].max_el; - // dem[indx].min_el = tiles[indx].min_el; - - // //Not sure why we set these here... - // if (tiles[indx].max_el > max_elevation) - // max_elevation = tiles[indx].max_el; - // if (tiles[indx].min_el < min_elevation) - // min_elevation = tiles[indx].min_el; - - // if (max_north == -90) - // max_north = dem[indx].max_north; - - // else if (dem[indx].max_north > max_north) - // max_north = dem[indx].max_north; - - // if (min_north == 90) - // min_north = dem[indx].min_north; - - // else if (dem[indx].min_north < min_north) - // min_north = dem[indx].min_north; - - // if (dem[indx].max_west > max_west) - // max_west = dem[indx].max_west; - // if (dem[indx].min_west < min_west) - // min_west = dem[indx].min_west; - - // if (max_west == -1) { - // max_west = dem[indx].max_west; - // } else { - // if (abs(dem[indx].max_west - max_west) < 180) { - // if (dem[indx].max_west > max_west) - // max_west = dem[indx].max_west; - // } else { - // if (dem[indx].max_west < max_west) - // max_west = dem[indx].max_west; - // } - // } - - // if (min_west == 360) { - // min_west = dem[indx].min_west; - // } else { - // if (fabs(dem[indx].min_west - min_west) < 180.0) { - // if (dem[indx].min_west < min_west) - // min_west = dem[indx].min_west; - // } else { - // if (dem[indx].min_west > min_west) - // min_west = dem[indx].min_west; - // } - // } - - // // /* Copy the lidar tile data into the dem array */ - // // int x = tiles[indx].width-1; - // // int y = tiles[indx].height-1; - // // for (size_t h = 0; h < tiles[indx].height; h++, y--) { - // // for (size_t w = 0; w < tiles[indx].width; w++, x--) { - // // dem[indx].data[y][x] = tiles[indx].data[h*tiles[indx].width + w]; - // // dem[indx].signal[h][w] = 0; - // // dem[indx].mask[h][w] = 0; - // // } - // // } - - // } - for ( int indx = 0; indx < fc; indx++ ) { if ( (fd = fopen(files[indx],"rb")) == NULL) return errno;