diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-09-11 13:05:30 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-09-13 13:27:44 +0200 |
| commit | 071129bf61dda7d23c6f305b0c42139bf20560cb (patch) | |
| tree | 9315fb5421cf5a98a7a1a227a64f39e21e9e9e8e /src | |
| parent | 6367fcb2a82c52c7f80e82941621be603373a57b (diff) | |
| download | qtlocation-mapboxgl-071129bf61dda7d23c6f305b0c42139bf20560cb.tar.gz | |
[linux,qt] Remove remainder of WebP support
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/util/mapbox.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/mbgl/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp index cdd51a293d..b823b727a7 100644 --- a/src/mbgl/util/mapbox.cpp +++ b/src/mbgl/util/mapbox.cpp @@ -136,19 +136,7 @@ canonicalizeTileURL(const std::string& str, const style::SourceType type, const if (type == style::SourceType::Raster || type == style::SourceType::RasterDEM) { result += tileSize == util::tileSize ? "@2x" : "{ratio}"; } - -#if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(QT_IMAGE_DECODERS) - const bool forceWebP = str.compare(path.extension.first, path.extension.second, ".png") == 0; -#else - const bool forceWebP = false; -#endif // !defined(__ANDROID__) && !defined(__APPLE__) && !defined(QT_IMAGE_DECODERS) - - // Replace PNG with WebP if necessary. - if (forceWebP) { - result += ".webp"; - } else { - result.append(str, path.extension.first, path.extension.second); - } + result.append(str, path.extension.first, path.extension.second); // Append the query string, minus the access token parameter. if (url.query.second > 1) { |