diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 08:25:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix struct name collision [#12]

Browse Source
This commit is contained in:
Brandon Liu
2022-04-27 22:14:22 +08:00
parent 7c726e4d2c
commit d04bd09d11
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flatgeobuf.cpp
+4 -4
View File
@@ -248,7 +248,7 @@ void readFeature(const FlatGeobuf::Feature *feature, long long feature_sequence_
serialize_feature(sst, sf); serialize_feature(sst, sf);
} }
struct queued_feature { struct fgb_queued_feature {
const FlatGeobuf::Feature *feature = NULL; const FlatGeobuf::Feature *feature = NULL;
long long feature_sequence_id = -1; long long feature_sequence_id = -1;
FlatGeobuf::GeometryType h_geometry_type = FlatGeobuf::GeometryType::Unknown; FlatGeobuf::GeometryType h_geometry_type = FlatGeobuf::GeometryType::Unknown;
@@ -259,7 +259,7 @@ struct queued_feature {
std::string layername = ""; std::string layername = "";
}; };
static std::vector<queued_feature> feature_queue; static std::vector<fgb_queued_feature> feature_queue;
struct queue_run_arg { struct queue_run_arg {
size_t start; size_t start;
@@ -275,7 +275,7 @@ void *fgb_run_parse_feature(void *v) {
struct queue_run_arg *qra = (struct queue_run_arg *) v; struct queue_run_arg *qra = (struct queue_run_arg *) v;
for (size_t i = qra->start; i < qra->end; i++) { for (size_t i = qra->start; i < qra->end; i++) {
struct queued_feature &qf = feature_queue[i]; struct fgb_queued_feature &qf = feature_queue[i];
readFeature(qf.feature, qf.feature_sequence_id, qf.h_geometry_type, *qf.h_column_names, *qf.h_column_types, &(*qf.sst)[qra->segment], qf.layer, qf.layername); readFeature(qf.feature, qf.feature_sequence_id, qf.h_geometry_type, *qf.h_column_names, *qf.h_column_types, &(*qf.sst)[qra->segment], qf.layer, qf.layername);
} }
@@ -323,7 +323,7 @@ void fgbRunQueue() {
} }
void queueFeature(const FlatGeobuf::Feature *feature, long long feature_sequence_id, FlatGeobuf::GeometryType h_geometry_type, const std::vector<std::string> &h_column_names, const std::vector<FlatGeobuf::ColumnType> &h_column_types, std::vector<struct serialization_state> *sst, int layer, std::string layername) { void queueFeature(const FlatGeobuf::Feature *feature, long long feature_sequence_id, FlatGeobuf::GeometryType h_geometry_type, const std::vector<std::string> &h_column_names, const std::vector<FlatGeobuf::ColumnType> &h_column_types, std::vector<struct serialization_state> *sst, int layer, std::string layername) {
struct queued_feature qf; struct fgb_queued_feature qf;
qf.feature = feature; qf.feature = feature;
qf.feature_sequence_id = feature_sequence_id; qf.feature_sequence_id = feature_sequence_id;
qf.h_geometry_type = h_geometry_type; qf.h_geometry_type = h_geometry_type;