ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-04-19 08:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[tippecanoe] still trying to fix build errors

Browse Source
This commit is contained in:
Ilia Platone 2018-12-24 17:38:28 +01:00
parent 05ac48e4cd
commit cdf5322e9a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -343,7 +343,7 @@ tests/%.json: Makefile tippecanoe tippecanoe-decode
rm $@.check.mbtiles
deflate:
make -C libdeflate libdeflate.a
cd libdeflate && make BUILDTYPE=$(BUILDTYPE) libdeflate.a
deflate-clean:
make -C libdeflate realclean
cd libdeflate && make realclean

14
mvt.cpp
View File

@ -34,8 +34,8 @@ int decompress(std::string const &input, std::string &output) {
long unsigned int actual_out = 0;
long unsigned int actual_in = 0;
output.resize(avail_out);
void *current_out = (void*)output.data();
void *current_in = (void*)input.data();
void *current_out = (void *) output.data();
void *current_in = (void *) input.data();
struct libdeflate_decompressor *decompressor = libdeflate_alloc_decompressor();
decompress:
@ -48,8 +48,8 @@ decompress:
actual_out += actual_output;
if (ret == LIBDEFLATE_SHORT_OUTPUT) {
output.resize(actual_out + avail_out);
current_out = (void*)((long)output.data() + actual_out);
current_in = (void*)((long)input.data() + actual_in);
current_out = (void *) ((long) output.data() + actual_out);
current_in = (void *) ((long) input.data() + actual_in);
goto decompress;
}
libdeflate_free_decompressor(decompressor);
@ -78,8 +78,8 @@ int compress(std::string const &input, std::string &output) {
output.resize(avail_out);
struct libdeflate_compressor *deflate_s = libdeflate_alloc_compressor(9);
int ret = libdeflate_deflate_compress(deflate_s,
(void*)input.data(), avail_in,
(void*)output.data(), avail_out);
(void *) input.data(), avail_in,
(void *) output.data(), avail_out);
libdeflate_free_compressor(deflate_s);
if (ret == 0) {
return -1;
@ -104,7 +104,7 @@ bool mvt_tile::decode(std::string &message, bool &was_compressed) {
while (reader.next()) {
switch (reader.tag()) {
case 3: /* layer */ {
case 3: /* layer */ {
protozero::pbf_reader layer_reader(reader.get_message());
mvt_layer layer;