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-11 13:14:42 +0200 |
| commit | 8ec92b72473305cbf14c31b185fd5634ce670837 (patch) | |
| tree | 74b9ec23620e3d1f27b17c25947f8f2cf01216ed /platform/qt | |
| parent | 6e171a62a9cc07ddbb0765e3021e46ebd60313df (diff) | |
| download | qtlocation-mapboxgl-upstream/remove-webp.tar.gz | |
[linux,qt] Remove remainder of WebP supportupstream/remove-webp
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/config.cmake | 3 | ||||
| -rw-r--r-- | platform/qt/src/qt_image.cpp | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 5f639b3f78..9f7ee24cfb 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -25,12 +25,10 @@ macro(mbgl_platform_core) target_sources(mbgl-core PRIVATE platform/default/jpeg_reader.cpp PRIVATE platform/default/png_reader.cpp - PRIVATE platform/default/webp_reader.cpp ) target_add_mason_package(mbgl-core PRIVATE libjpeg-turbo) target_add_mason_package(mbgl-core PRIVATE libpng) - target_add_mason_package(mbgl-core PRIVATE webp) else() add_definitions(-DQT_IMAGE_DECODERS) endif() @@ -84,6 +82,7 @@ if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") target_link_libraries(mbgl-test PRIVATE qmapboxgl PRIVATE mbgl-filesource + PRIVATE -pthread ) endmacro() endif() diff --git a/platform/qt/src/qt_image.cpp b/platform/qt/src/qt_image.cpp index a5c92514c1..848a9b7f0a 100644 --- a/platform/qt/src/qt_image.cpp +++ b/platform/qt/src/qt_image.cpp @@ -21,7 +21,6 @@ std::string encodePNG(const PremultipliedImage& pre) { #if !defined(QT_IMAGE_DECODERS) PremultipliedImage decodeJPEG(const uint8_t*, size_t); -PremultipliedImage decodeWebP(const uint8_t*, size_t); #endif PremultipliedImage decodeImage(const std::string& string) { @@ -29,14 +28,6 @@ PremultipliedImage decodeImage(const std::string& string) { const size_t size = string.size(); #if !defined(QT_IMAGE_DECODERS) - 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); - } - } - if (size >= 2) { uint16_t magic = ((data[0] << 8) | data[1]) & 0xffff; if (magic == 0xFFD8) { |