[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

@@ -4,10 +4,6 @@
namespace mbgl {
#if !defined(__ANDROID__) && !defined(__APPLE__)
PremultipliedImage decodeWebP(const uint8_t*, size_t);
#endif // !defined(__ANDROID__) && !defined(__APPLE__)
PremultipliedImage decodePNG(const uint8_t*, size_t);
PremultipliedImage decodeJPEG(const uint8_t*, size_t);
@@ -15,16 +11,6 @@ PremultipliedImage decodeImage(const std::string& string) {
const auto* data = reinterpret_cast<const uint8_t*>(string.data());
const size_t size = string.size();
#if !defined(__ANDROID__) && !defined(__APPLE__)
if (size >= 12) {
uint32_t riff_magic = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
uint32_t webp_magic = (data[8] << 24) | (data[9] << 16) | (data[10] << 8) | data[11];
if (riff_magic == 0x52494646 && webp_magic == 0x57454250) {
return decodeWebP(data, size);
}
}
#endif // !defined(__ANDROID__) && !defined(__APPLE__)
if (size >= 4) {
uint32_t magic = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
if (magic == 0x89504E47U) {