ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-02-23 18:40:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the FILE-like abstraction that zlib already provides

Browse Source
This commit is contained in:
Eric Fischer 2018-05-14 12:17:49 -07:00
parent 0244f04b71
commit 73398a0484
1 changed files with 31 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
main.cpp
View File

@ -478,41 +478,31 @@ void do_read_parallel(char *map, long long len, long long initial_offset, const
} }
static ssize_t read_stream(json_pull *j, char *buffer, size_t n); static ssize_t read_stream(json_pull *j, char *buffer, size_t n);
#define BUF 262144
struct STREAM { struct STREAM {
FILE *fp; FILE *fp = NULL;
gzFile gz = NULL;
bool gz;
z_stream inflate_s;
Bytef buf[BUF];
std::vector<unsigned char> ahead;
int fclose() { int fclose() {
if (gz) { int ret;
inflateEnd(&inflate_s);
if (gz != NULL) {
ret = gzclose(gz);
} else {
ret = ::fclose(fp);
} }
int ret = ::fclose(fp);
delete this; delete this;
return ret; return ret;
} }
int peekc() { int peekc() {
if (gz) { if (gz != NULL) {
if (ahead.size() > 0) { int c = gzgetc(gz);
return ahead[ahead.size() - 1]; if (c != EOF) {
gzungetc(c, gz);
} }
return c;
char tmp[1];
size_t nread = read(tmp, 1);
if (nread == 0) {
return EOF;
}
ahead.push_back(tmp[0]);
return (unsigned char) tmp[0];
} else { } else {
int c = getc(fp); int c = getc(fp);
if (c != EOF) { if (c != EOF) {
@ -523,53 +513,13 @@ struct STREAM {
} }
size_t read(char *out, size_t count) { size_t read(char *out, size_t count) {
if (gz) { if (gz != NULL) {
if (ahead.size() > 0 && count > 0) { int ret = gzread(gz, out, count);
out[0] = ahead[ahead.size() - 1]; if (ret < 0) {
ahead.resize(ahead.size() - 1); fprintf(stderr, "%s: Error reading compressed data\n", *av);
return 1;
}
while (true) {
// Move any existing readahead to the start
memmove(buf, inflate_s.next_in, inflate_s.avail_in);
inflate_s.next_in = buf;
// Read more compressed data if there is room and availability
bool eof = false;
if (inflate_s.avail_in < BUF) {
size_t nread = ::fread(inflate_s.next_in + inflate_s.avail_in, sizeof(char), BUF - inflate_s.avail_in, fp);
inflate_s.avail_in += nread;
if (nread == 0) {
eof = true;
}
}
inflate_s.avail_out = count;
inflate_s.next_out = (Bytef *) out;
int ret = inflate(&inflate_s, Z_SYNC_FLUSH);
if (ret == Z_STREAM_ERROR || ret == Z_MEM_ERROR || ret == Z_DATA_ERROR) {
fprintf(stderr, "%s: Decompression error %s\n", *av, inflate_s.msg);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
return ret;
if (inflate_s.next_out != (Bytef *) out) {
size_t n = inflate_s.next_out - (Bytef *) out;
return n;
}
if (ret == Z_STREAM_END) {
return 0;
}
if (eof) {
fprintf(stderr, "%s: Compressed data was truncated\n", *av);
exit(EXIT_FAILURE);
}
}
} else { } else {
return ::fread(out, 1, count, fp); return ::fread(out, 1, count, fp);
} }
@ -585,30 +535,22 @@ static ssize_t read_stream(json_pull *j, char *buffer, size_t n) {
} }
STREAM *streamfdopen(int fd, const char *mode, std::string const &fname) { STREAM *streamfdopen(int fd, const char *mode, std::string const &fname) {
FILE *fp = fdopen(fd, mode);
if (fp == NULL) {
return NULL;
}
STREAM *s = new STREAM; STREAM *s = new STREAM;
s->fp = fp; s->fp = NULL;
s->gz = false; s->gz = NULL;
if (fname.size() > 3 && fname.substr(fname.size() - 3) == std::string(".gz")) { if (fname.size() > 3 && fname.substr(fname.size() - 3) == std::string(".gz")) {
s->inflate_s.zalloc = Z_NULL; s->gz = gzdopen(fd, mode);
s->inflate_s.zfree = Z_NULL; if (s->gz == NULL) {
s->inflate_s.opaque = Z_NULL; fprintf(stderr, "%s: %s: Decompression error\n", *av, fname.c_str());
s->inflate_s.avail_in = 0; exit(EXIT_FAILURE);
s->inflate_s.next_in = Z_NULL; }
} else {
if (inflateInit2(&s->inflate_s, 32 + 15) != Z_OK) { s->fp = fdopen(fd, mode);
fprintf(stderr, "%s: %s: Decompression error %s\n", *av, fname.c_str(), s->inflate_s.msg); if (s->fp == NULL) {
perror(fname.c_str());
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
s->inflate_s.next_in = s->buf;
s->inflate_s.avail_in = 0;
s->gz = true;
} }
return s; return s;
@ -617,7 +559,7 @@ STREAM *streamfdopen(int fd, const char *mode, std::string const &fname) {
STREAM *streamfpopen(FILE *fp) { STREAM *streamfpopen(FILE *fp) {
STREAM *s = new STREAM; STREAM *s = new STREAM;
s->fp = fp; s->fp = fp;
s->gz = false; s->gz = NULL;
return s; return s;
} }