diff options
Diffstat (limited to 'platform/qt/src/qt_image.cpp')
| -rw-r--r-- | platform/qt/src/qt_image.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/platform/qt/src/qt_image.cpp b/platform/qt/src/qt_image.cpp index a5c92514c1..ff45b02ef1 100644 --- a/platform/qt/src/qt_image.cpp +++ b/platform/qt/src/qt_image.cpp @@ -6,7 +6,7 @@ namespace mbgl { -std::string encodePNG(const PremultipliedImage& pre) { +Blob encodePNG(const PremultipliedImage& pre) { QImage image(pre.data.get(), pre.size.width, pre.size.height, QImage::Format_ARGB32_Premultiplied); @@ -16,7 +16,7 @@ std::string encodePNG(const PremultipliedImage& pre) { buffer.open(QIODevice::WriteOnly); image.rgbSwapped().save(&buffer, "PNG"); - return std::string(array.constData(), array.size()); + return { std::string(array.constData(), array.size()), false }; } #if !defined(QT_IMAGE_DECODERS) @@ -24,9 +24,10 @@ PremultipliedImage decodeJPEG(const uint8_t*, size_t); PremultipliedImage decodeWebP(const uint8_t*, size_t); #endif -PremultipliedImage decodeImage(const std::string& string) { - const uint8_t* data = reinterpret_cast<const uint8_t*>(string.data()); - const size_t size = string.size(); +PremultipliedImage decodeImage(Blob blob) { + const auto uncompressed = blob.uncompressedData(); + const uint8_t* data = reinterpret_cast<const uint8_t*>(uncompressed->data()); + const size_t size = uncompressed->size(); #if !defined(QT_IMAGE_DECODERS) if (size >= 12) { |