diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-02-20 15:06:26 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-02-21 14:50:13 +0100 |
| commit | 021e1ae596440cfdee5ffe75907b76069ae44307 (patch) | |
| tree | ebf15ff8a72e5f14291ba37b6f297ca9a738eea4 /platform/darwin/src/http_file_source.mm | |
| parent | 06213d9145d3b20b63e235cc25678fd76dc296d0 (diff) | |
| download | qtlocation-mapboxgl-upstream/blob.tar.gz | |
[core] introduce Blob for compressed and uncompressed dataupstream/blob
- Blob is a wrapper type for a shared_ptr<const string> that has accessor functions for getting compressed and uncompressed data
- Moved util::writeFile, util::readFile, util::compress, util::uncompress, decodeImage, and encodePNG to the Blob interface
- Added Blob support to Request and file sources
- Added Blob support to VectorTile objects
- Added support for gzip decoding to util::uncompress
- We're no longer compressing WebP, PNG, and JPEG data when storing in the OfflineDatabase
- Android's HTTPRequest returns compressed Blobs by default
One caveat is that our previous decompress function didn't support gzip, so once users upgrade to this version, their offline cache may contain both zlib-compressed data and gzip-compressed data, but older versions won't be able to decompress gzip data. On the other hand, we don't support downgrading SDKs anyway, so this shouldn't be a problem. To be on the safe side, we could bump the user_version of the SQLite DB.
Diffstat (limited to 'platform/darwin/src/http_file_source.mm')
| -rw-r--r-- | platform/darwin/src/http_file_source.mm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm index 4a16ad82fb..6840740c44 100644 --- a/platform/darwin/src/http_file_source.mm +++ b/platform/darwin/src/http_file_source.mm @@ -232,8 +232,7 @@ std::unique_ptr<AsyncRequest> HTTPFileSource::request(const Resource& resource, if (error) { if (data) { - response.data = - std::make_shared<std::string>((const char*)[data bytes], [data length]); + response.data = Blob{ { (const char*)[data bytes], [data length] }, false }; } switch ([error code]) { @@ -287,7 +286,7 @@ std::unique_ptr<AsyncRequest> HTTPFileSource::request(const Resource& resource, } if (responseCode == 200) { - response.data = std::make_shared<std::string>((const char *)[data bytes], [data length]); + response.data = { { (const char *)[data bytes], [data length] }, false }; } else if (responseCode == 204 || (responseCode == 404 && resource.kind == Resource::Kind::Tile)) { response.noContent = true; } else if (responseCode == 304) { |