diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-10 12:24:45 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-10 12:24:45 -0400 |
| commit | 2d1219fa5154c489cd856bedd04b84573d45ac04 (patch) | |
| tree | a8e42e6acd79f73aac228e0fe6876917067db8c4 /include/mbgl/util/compression.hpp | |
| parent | 8f6e8eead12c6b2c2de0ce76fa7df39ca2445006 (diff) | |
| parent | f390dab0ea7d449bdd89855c84e47f4a07606fe4 (diff) | |
| download | qtlocation-mapboxgl-2d1219fa5154c489cd856bedd04b84573d45ac04.tar.gz | |
Merge branch 'master' into libuv-0.10-headless-display
Conflicts:
common/curl_request.cpp
common/glfw_view.cpp
common/glfw_view.hpp
include/mbgl/platform/request.hpp
ios/mapbox-gl-cocoa
setup-libraries.sh
src/map/map.cpp
src/platform/request.cpp
test/fixtures/fixture_request.cpp
Diffstat (limited to 'include/mbgl/util/compression.hpp')
| -rw-r--r-- | include/mbgl/util/compression.hpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/mbgl/util/compression.hpp b/include/mbgl/util/compression.hpp new file mode 100644 index 0000000000..a33b2476a7 --- /dev/null +++ b/include/mbgl/util/compression.hpp @@ -0,0 +1,15 @@ +#ifndef MBGL_UTIL_COMPRESSION +#define MBGL_UTIL_COMPRESSION + +#include <string> + +namespace mbgl { +namespace util { + +std::string compress(const std::string &raw); +std::string decompress(const std::string &raw); + +} +} + +#endif |