diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-10-26 15:22:31 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-10-27 18:30:58 -0700 |
commit | 62b56b799a7d4fcd1a8f151eed878054b862da5b (patch) | |
tree | 34d510a69f9dd1bca30e9b137feffbd1eb6495d0 /platform/qt | |
parent | ef8017198ce8f0bd79ba5a5ed31e35a16e3433bb (diff) | |
download | qtlocation-mapboxgl-62b56b799a7d4fcd1a8f151eed878054b862da5b.tar.gz |
[core] change std::array<uint16_t, 2> to mbgl::Size
Diffstat (limited to 'platform/qt')
-rw-r--r-- | platform/qt/src/image.cpp | 4 | ||||
-rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 41 |
2 files changed, 26 insertions, 19 deletions
diff --git a/platform/qt/src/image.cpp b/platform/qt/src/image.cpp index 3918b35208..403ca9cbd3 100644 --- a/platform/qt/src/image.cpp +++ b/platform/qt/src/image.cpp @@ -7,7 +7,7 @@ namespace mbgl { std::string encodePNG(const PremultipliedImage& pre) { - QImage image(pre.data.get(), pre.width, pre.height, + QImage image(pre.data.get(), pre.size.width, pre.size.height, QImage::Format_ARGB32_Premultiplied); QByteArray array; @@ -57,7 +57,7 @@ PremultipliedImage decodeImage(const std::string& string) { auto img = std::make_unique<uint8_t[]>(image.byteCount()); memcpy(img.get(), image.constBits(), image.byteCount()); - return { static_cast<uint16_t>(image.width()), static_cast<uint16_t>(image.height()), + return { { static_cast<uint32_t>(image.width()), static_cast<uint32_t>(image.height()) }, std::move(img) }; } } diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index edda1f9599..d54f6b3409 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -122,8 +122,9 @@ std::unique_ptr<const mbgl::SpriteImage> toSpriteImage(const QImage &sprite) { memcpy(img.get(), swapped.constBits(), swapped.byteCount()); return std::make_unique<mbgl::SpriteImage>( - mbgl::PremultipliedImage{ static_cast<uint16_t>(swapped.width()), - static_cast<uint16_t>(swapped.height()), std::move(img) }, + mbgl::PremultipliedImage( + { static_cast<uint32_t>(swapped.width()), static_cast<uint32_t>(swapped.height()) }, + std::move(img)), 1.0); } @@ -611,7 +612,8 @@ void QMapboxGL::resize(const QSize& size, const QSize& framebufferSize) d_ptr->size = size; d_ptr->fbSize = framebufferSize; - d_ptr->mapObj->setSize({{ static_cast<uint16_t>(size.width()), static_cast<uint16_t>(size.height()) }}); + d_ptr->mapObj->setSize( + { static_cast<uint32_t>(size.width()), static_cast<uint32_t>(size.height()) }); } void QMapboxGL::addAnnotationIcon(const QString &name, const QImage &sprite) @@ -824,7 +826,7 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin settings.cacheDatabaseMaximumSize())) , threadPool(4) , mapObj(std::make_unique<mbgl::Map>( - *this, std::array<uint16_t, 2>{{ static_cast<uint16_t>(size.width()), static_cast<uint16_t>(size.height()) }}, + *this, mbgl::Size{ static_cast<uint32_t>(size.width()), static_cast<uint32_t>(size.height()) }, pixelRatio, *fileSourceObj, threadPool, static_cast<mbgl::MapMode>(settings.mapMode()), static_cast<mbgl::GLContextMode>(settings.contextMode()), @@ -849,33 +851,38 @@ void QMapboxGLPrivate::updateFramebufferBinding(QOpenGLFramebufferObject *fbo_) if (fbo) { getContext().bindFramebuffer.setDirty(); getContext().viewport.setCurrentValue( - { 0, 0, static_cast<uint16_t>(fbo->width()), static_cast<uint16_t>(fbo->height()) }); + { 0, + 0, + { static_cast<uint32_t>(fbo->width()), static_cast<uint32_t>(fbo->height()) } }); } else { getContext().bindFramebuffer.setCurrentValue(0); - getContext().viewport.setCurrentValue({ 0, 0, static_cast<uint16_t>(fbSize.width()), - static_cast<uint16_t>(fbSize.height()) }); + getContext().viewport.setCurrentValue( + { 0, + 0, + { static_cast<uint32_t>(fbSize.width()), static_cast<uint32_t>(fbSize.height()) } }); } } -void QMapboxGLPrivate::bind() -{ +void QMapboxGLPrivate::bind() { if (fbo) { fbo->bind(); getContext().bindFramebuffer.setDirty(); - getContext().viewport = { 0, 0, static_cast<uint16_t>(fbo->width()), - static_cast<uint16_t>(fbo->height()) }; + getContext().viewport = { + 0, 0, { static_cast<uint32_t>(fbo->width()), static_cast<uint32_t>(fbo->height()) } + }; } else { getContext().bindFramebuffer = 0; - getContext().viewport = { 0, 0, static_cast<uint16_t>(fbSize.width()), - static_cast<uint16_t>(fbSize.height()) }; + getContext().viewport = { + 0, 0, { static_cast<uint32_t>(fbSize.width()), static_cast<uint32_t>(fbSize.height()) } + }; } } #else -void QMapboxGLPrivate::bind() -{ +void QMapboxGLPrivate::bind() { getContext().bindFramebuffer = 0; - getContext().viewport = { 0, 0, static_cast<uint16_t>(fbSize.width()), - static_cast<uint16_t>(fbSize.height()) }; + getContext().viewport = { + 0, 0, { static_cast<uint32_t>(fbSize.width()), static_cast<uint32_t>(fbSize.height()) } + }; } #endif |