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

Work on alternating compressed and uncompressed in decompression

Browse Source
This commit is contained in:
Erica Fischer
2023-01-30 13:32:24 -08:00
parent 34926cf1dc
commit 26d93a1a8d
1 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile.cpp
+40 -11
View File
@@ -53,6 +53,7 @@ struct decompressor {
FILE *fp = NULL; FILE *fp = NULL;
z_stream zs; z_stream zs;
std::string buf; std::string buf;
bool within = false;
decompressor(FILE *f) { decompressor(FILE *f) {
fp = f; fp = f;
@@ -65,6 +66,8 @@ struct decompressor {
decompressor() { } decompressor() { }
void begin() { void begin() {
within = true;
zs.zalloc = NULL; zs.zalloc = NULL;
zs.zfree = NULL; zs.zfree = NULL;
zs.opaque = NULL; zs.opaque = NULL;
@@ -77,6 +80,16 @@ struct decompressor {
} }
} }
void end() {
within = false;
int d = inflateEnd(&zs);
if (d != Z_OK) {
fprintf(stderr, "end decompression: %d %s\n", d, zs.msg);
exit(EXIT_IMPOSSIBLE);
}
}
int fread(void *p, size_t size, size_t nmemb, std::atomic<long long> *geompos) { int fread(void *p, size_t size, size_t nmemb, std::atomic<long long> *geompos) {
zs.next_out = (Bytef *) p; zs.next_out = (Bytef *) p;
zs.avail_out = size * nmemb; zs.avail_out = size * nmemb;
@@ -85,25 +98,41 @@ struct decompressor {
if (zs.avail_in == 0) { if (zs.avail_in == 0) {
size_t n = ::fread((Bytef *) buf.c_str(), sizeof(char), buf.size(), fp); size_t n = ::fread((Bytef *) buf.c_str(), sizeof(char), buf.size(), fp);
if (n == 0) { if (n == 0) {
fprintf(stderr, "Reached EOF while decompressing\n"); if (within) {
exit(EXIT_IMPOSSIBLE); fprintf(stderr, "Reached EOF while decompressing\n");
exit(EXIT_IMPOSSIBLE);
} else {
break;
}
} }
zs.next_in = (Bytef *) buf.c_str(); zs.next_in = (Bytef *) buf.c_str();
zs.avail_in = n; zs.avail_in = n;
} }
size_t avail_before = zs.avail_in; size_t avail_before = zs.avail_in;
int d = inflate(&zs, Z_NO_FLUSH);
*geompos += avail_before - zs.avail_in;
if (d == Z_OK) { if (within) {
// it made some progress int d = inflate(&zs, Z_NO_FLUSH);
} else if (d == Z_STREAM_END) { *geompos += avail_before - zs.avail_in;
// it may have made some progress and now we are done
break; if (d == Z_OK) {
// it made some progress
} else if (d == Z_STREAM_END) {
// it may have made some progress and now we are done
break;
} else {
fprintf(stderr, "decompression error %d %s\n", d, zs.msg);
exit(EXIT_IMPOSSIBLE);
}
} else { } else {
fprintf(stderr, "decompression error %d %s\n", d, zs.msg); size_t n = std::min(zs.avail_in, zs.avail_out);
exit(EXIT_IMPOSSIBLE); memcpy(zs.next_out, zs.next_in, n);
*geompos += n;
zs.avail_out -= n;
zs.avail_in -= n;
zs.next_out += n;
zs.next_in += n;
} }
} }