mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 16:35:40 +02:00
Erica FischerandCursor
3da03c6075
Replace the manual malloc/realloc/free memory management in jsonpull with std::shared_ptr ownership. Each json_object now owns its children through std::vector<json_object_ptr>; raw back-pointers to parent and parser remain valid by structural invariant and are cleared on json_disconnect so detached subtrees can outlive their parser. Strings become std::string, child arrays become std::vector, and the old union becomes a struct so non-trivial members can coexist while preserving the existing o->value.xxx access paths. The old jsonpull.c is replaced by jsonpull.cpp, json_stringify now returns std::string, and all callers across tippecanoe, tile-join, tippecanoe-decode, tippecanoe-json-tool, tippecanoe-overzoom and the unit tests are updated to use json_object_ptr / json_pull_ptr. Co-authored-by: Cursor <cursoragent@cursor.com>
31 lines
717 B
C++
31 lines
717 B
C++
#ifndef GEOJSON_HPP
|
|
#define GEOJSON_HPP
|
|
|
|
#include <stdio.h>
|
|
#include <set>
|
|
#include <map>
|
|
#include <string>
|
|
#include "mbtiles.hpp"
|
|
#include "jsonpull/jsonpull.h"
|
|
#include "serial.hpp"
|
|
|
|
struct parse_json_args {
|
|
json_pull_ptr jp;
|
|
int layer;
|
|
std::string *layername;
|
|
|
|
struct serialization_state *sst;
|
|
|
|
parse_json_args(json_pull_ptr jp1, int layer1, std::string *layername1, struct serialization_state *sst1)
|
|
: jp(jp1), layer(layer1), layername(layername1), sst(sst1) {
|
|
}
|
|
};
|
|
|
|
json_pull_ptr json_begin_map(char *map, long long len);
|
|
void json_end_map(json_pull_ptr jp);
|
|
|
|
void parse_json(struct serialization_state *sst, json_pull_ptr jp, int layer, std::string layername);
|
|
void *run_parse_json(void *v);
|
|
|
|
#endif
|