ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-02-22 10:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of some C99-style variable-length arrays

Browse Source
This commit is contained in:
Eric Fischer 2017-11-09 16:50:38 -08:00
parent 23004808e4
commit dca1ebbbfb
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
geobuf.cpp
View File

@ -443,8 +443,11 @@ void runQueue() {
return; return;
} }
struct queue_run_arg qra[CPUS]; std::vector<struct queue_run_arg> qra;
pthread_t pthreads[CPUS]; qra.resize(CPUS);
std::vector<pthread_t> pthreads;
pthreads.resize(CPUS);
for (size_t i = 0; i < CPUS; i++) { for (size_t i = 0; i < CPUS; i++) {
*((*(feature_queue[0].sst))[i].layer_seq) = *((*(feature_queue[0].sst))[0].layer_seq) + feature_queue.size() * i / CPUS; *((*(feature_queue[0].sst))[i].layer_seq) = *((*(feature_queue[0].sst))[0].layer_seq) + feature_queue.size() * i / CPUS;

9
geojson.cpp
View File

@ -146,10 +146,15 @@ int serialize_geojson_feature(struct serialization_state *sst, json_object *geom
nprop = properties->length; nprop = properties->length;
} }
char *metakey[nprop]; std::vector<char *> metakey;
metakey.resize(nprop);
std::vector<std::string> metaval; std::vector<std::string> metaval;
metaval.resize(nprop); metaval.resize(nprop);
int metatype[nprop];
std::vector<int> metatype;
metatype.resize(nprop);
size_t m = 0; size_t m = 0;
for (size_t i = 0; i < nprop; i++) { for (size_t i = 0; i < nprop; i++) {