diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-11-13 13:36:55 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-11-13 13:36:55 +0200 |
| commit | b6cdc1fb50da570c9f275af82ff5349d679384bb (patch) | |
| tree | 9fdf5a3a55b09f23d6e809c0ba37a9be308b64cb | |
| parent | 92608f58858d77c17a65ae9b29758e74bb2da7d2 (diff) | |
| download | qtlocation-mapboxgl-upstream/qt-510-deprecation-warnings.tar.gz | |
[Qt] Fix deprecation warnings in Qt 5.10upstream/qt-510-deprecation-warnings
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 5 | ||||
| -rw-r--r-- | platform/qt/src/qt_image.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index fc281fdf1d..c9f85adf4c 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -111,8 +111,13 @@ std::unique_ptr<mbgl::style::Image> toStyleImage(const QString &id, const QImage .rgbSwapped() .convertToFormat(QImage::Format_ARGB32_Premultiplied); +#if QT_VERSION >= 0x051000 + auto img = std::make_unique<uint8_t[]>(swapped.sizeInBytes()); + memcpy(img.get(), swapped.constBits(), swapped.sizeInBytes()); +#else auto img = std::make_unique<uint8_t[]>(swapped.byteCount()); memcpy(img.get(), swapped.constBits(), swapped.byteCount()); +#endif return std::make_unique<mbgl::style::Image>( id.toStdString(), diff --git a/platform/qt/src/qt_image.cpp b/platform/qt/src/qt_image.cpp index 403ca9cbd3..a5c92514c1 100644 --- a/platform/qt/src/qt_image.cpp +++ b/platform/qt/src/qt_image.cpp @@ -54,8 +54,13 @@ PremultipliedImage decodeImage(const std::string& string) { throw std::runtime_error("Unsupported image type"); } +#if QT_VERSION >= 0x051000 + auto img = std::make_unique<uint8_t[]>(image.sizeInBytes()); + memcpy(img.get(), image.constBits(), image.sizeInBytes()); +#else auto img = std::make_unique<uint8_t[]>(image.byteCount()); memcpy(img.get(), image.constBits(), image.byteCount()); +#endif return { { static_cast<uint32_t>(image.width()), static_cast<uint32_t>(image.height()) }, std::move(img) }; |