diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-05 18:10:03 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-05-05 18:47:14 +0300 |
| commit | a81891771441dfc1c839b9d100368b6bbf1fc127 (patch) | |
| tree | da242c7812532526a40fe7bb43083b3047c5fd1a /src | |
| parent | 10e522d10b33e5268b619296eae0ccad899809d9 (diff) | |
| download | qtlocation-mapboxgl-a81891771441dfc1c839b9d100368b6bbf1fc127.tar.gz | |
[Qt] Make it possible to disable libwebp and libjpeg-turbo at build time
Pull less dependencies.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/util/mapbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp index 91d9b80515..41959563f0 100644 --- a/src/mbgl/util/mapbox.cpp +++ b/src/mbgl/util/mapbox.cpp @@ -153,12 +153,12 @@ std::string canonicalizeTileURL(const std::string& url, SourceType type, uint16_ auto tileset = url.substr(tilesetStartIdx, tilesetEndIdx - tilesetStartIdx); auto extension = url.substr(extensionIdx + 1, queryIdx - extensionIdx - 1); -#if !defined(__ANDROID__) && !defined(__APPLE__) +#if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(QT_IMAGE_DECODERS) // Replace PNG with WebP. if (extension == "png") { extension = "webp"; } -#endif // !defined(__ANDROID__) && !defined(__APPLE__) +#endif // !defined(__ANDROID__) && !defined(__APPLE__) && !defined(QT_IMAGE_DECODERS) std::string result = "mapbox://tiles/" + tileset + "/{z}/{x}/{y}"; |