Skip to content

Commit

Permalink
Try not calling begin() until after setting up avail_in and _out
Browse files Browse the repository at this point in the history
e-n-f committed Nov 16, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 3322ef3 commit 4619f23
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 0 additions & 3 deletions compression.cpp
Original file line number Diff line number Diff line change
@@ -20,9 +20,6 @@ void decompressor::begin() {
fprintf(stderr, "initialize decompression: %d %s\n", d, zs.msg);
exit(EXIT_IMPOSSIBLE);
}

zs.avail_out = 0;
zs.avail_in = 0;
}

int decompressor::fread(void *p, size_t size, size_t nmemb, std::atomic<long long> *geompos) {
7 changes: 5 additions & 2 deletions tile.cpp
Original file line number Diff line number Diff line change
@@ -1974,10 +1974,9 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
if (geoms->within) {
geoms->end(geompos_in);
}

geoms->begin();
}

printf("fseek to %lld\n", (long long) geoms->fp);
if (fseek(geoms->fp, og, SEEK_SET) != 0) {
perror("fseek geom");
exit(EXIT_SEEK);
@@ -1986,6 +1985,10 @@ long long write_tile(decompressor *geoms, std::atomic<long long> *geompos_in, ch
*geompos_in = og;
geoms->zs.avail_in = 0;
geoms->zs.avail_out = 0;

if (compressed_input) {
geoms->begin();
}
}

int prefilter_write = -1, prefilter_read = -1;

0 comments on commit 4619f23

Please sign in to comment.