[linux,qt] Remove remainder of WebP support

This commit is contained in:
Konstantin Käfer
2018-09-11 13:05:30 +02:00
parent 6367fcb2a8
commit 071129bf61
10 changed files with 4 additions and 103 deletions

View File

@@ -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) {