summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core-files.json1
-rw-r--r--src/mbgl/util/compression.cpp104
2 files changed, 0 insertions, 105 deletions
diff --git a/src/core-files.json b/src/core-files.json
index 4867bd3dc4..d881e6259d 100644
--- a/src/core-files.json
+++ b/src/core-files.json
@@ -284,7 +284,6 @@
"src/mbgl/tile/vector_tile_data.cpp",
"src/mbgl/util/chrono.cpp",
"src/mbgl/util/color.cpp",
- "src/mbgl/util/compression.cpp",
"src/mbgl/util/constants.cpp",
"src/mbgl/util/convert.cpp",
"src/mbgl/util/dtoa.cpp",
diff --git a/src/mbgl/util/compression.cpp b/src/mbgl/util/compression.cpp
deleted file mode 100644
index 1742898f9e..0000000000
--- a/src/mbgl/util/compression.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-#include <mbgl/util/compression.hpp>
-
-#if defined(__QT__) && defined(_WIN32) && !defined(__GNUC__)
-#include <QtZlib/zlib.h>
-#else
-#include <zlib.h>
-#endif
-
-#include <cstdio>
-#include <cstring>
-#include <stdexcept>
-
-// Check zlib library version.
-const static bool zlibVersionCheck __attribute__((unused)) = []() {
- const char *const version = zlibVersion();
- if (version[0] != ZLIB_VERSION[0]) {
- char message[96];
- snprintf(message, 96, "zlib version mismatch: headers report %s, but library reports %s",
- ZLIB_VERSION, version);
- throw std::runtime_error(message);
- }
-
- return true;
-}();
-
-namespace mbgl {
-namespace util {
-
-// Needed when using a zlib compiled with -DZ_PREFIX
-// because it will mess with this function name and
-// cause a link error.
-#undef compress
-
-std::string compress(const std::string &raw) {
- z_stream deflate_stream;
- memset(&deflate_stream, 0, sizeof(deflate_stream));
-
- // TODO: reuse z_streams
- if (deflateInit(&deflate_stream, Z_DEFAULT_COMPRESSION) != Z_OK) {
- throw std::runtime_error("failed to initialize deflate");
- }
-
- deflate_stream.next_in = (Bytef *)raw.data();
- deflate_stream.avail_in = uInt(raw.size());
-
- std::string result;
- char out[16384];
-
- int code;
- do {
- deflate_stream.next_out = reinterpret_cast<Bytef *>(out);
- deflate_stream.avail_out = sizeof(out);
- code = deflate(&deflate_stream, Z_FINISH);
- if (result.size() < deflate_stream.total_out) {
- // append the block to the output string
- result.append(out, deflate_stream.total_out - result.size());
- }
- } while (code == Z_OK);
-
- deflateEnd(&deflate_stream);
-
- if (code != Z_STREAM_END) {
- throw std::runtime_error(deflate_stream.msg);
- }
-
- return result;
-}
-
-std::string decompress(const std::string &raw) {
- z_stream inflate_stream;
- memset(&inflate_stream, 0, sizeof(inflate_stream));
-
- // TODO: reuse z_streams
- if (inflateInit(&inflate_stream) != Z_OK) {
- throw std::runtime_error("failed to initialize inflate");
- }
-
- inflate_stream.next_in = (Bytef *)raw.data();
- inflate_stream.avail_in = uInt(raw.size());
-
- std::string result;
- char out[15384];
-
- int code;
- do {
- inflate_stream.next_out = reinterpret_cast<Bytef *>(out);
- inflate_stream.avail_out = sizeof(out);
- code = inflate(&inflate_stream, 0);
- // result.append(out, sizeof(out) - inflate_stream.avail_out);
- if (result.size() < inflate_stream.total_out) {
- result.append(out, inflate_stream.total_out - result.size());
- }
- } while (code == Z_OK);
-
- inflateEnd(&inflate_stream);
-
- if (code != Z_STREAM_END) {
- throw std::runtime_error(inflate_stream.msg ? inflate_stream.msg : "decompression error");
- }
-
- return result;
-}
-} // namespace util
-} // namespace mbgl