summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-08-22 17:57:22 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-09-27 10:42:10 +0200
commit63e53de157e75e504a6bf1a678cebaea5acf72b9 (patch)
tree234cb14695f21df69012f1470ee512b8fc8d9904 /src
parent512037cfdc14fb1f7686254efe97b72433c5e4b6 (diff)
downloadqtlocation-mapboxgl-63e53de157e75e504a6bf1a678cebaea5acf72b9.tar.gz
[core] standardize on uint16_t for texture sizes
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/map/view.cpp2
-rw-r--r--src/mbgl/util/raster.cpp2
-rw-r--r--src/mbgl/util/raster.hpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/map/view.cpp b/src/mbgl/map/view.cpp
index 9e3352daa8..8541753c7a 100644
--- a/src/mbgl/map/view.cpp
+++ b/src/mbgl/map/view.cpp
@@ -10,7 +10,7 @@ void View::initialize(Map *map_) {
map = map_;
}
-PremultipliedImage View::readStillImage() {
+PremultipliedImage View::readStillImage(std::array<uint16_t, 2>) {
return {};
}
diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp
index 535d34b105..498f6027b7 100644
--- a/src/mbgl/util/raster.cpp
+++ b/src/mbgl/util/raster.cpp
@@ -18,7 +18,7 @@ GLuint Raster::getID() const {
return texture ? *texture : 0;
}
-std::array<size_t, 2> Raster::getSize() const {
+std::array<uint16_t, 2> Raster::getSize() const {
return size;
}
diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp
index 9d621668f4..860c533086 100644
--- a/src/mbgl/util/raster.hpp
+++ b/src/mbgl/util/raster.hpp
@@ -38,12 +38,12 @@ public:
GLuint getID() const;
// size of uploaded image.
- std::array<size_t, 2> getSize() const;
+ std::array<uint16_t, 2> getSize() const;
private:
// raw pixels have been loaded
std::atomic<bool> loaded { false };
- std::array<size_t, 2> size = {{ 0, 0 }};
+ std::array<uint16_t, 2> size = {{ 0, 0 }};
// filters
Scaling filter = Scaling::Nearest;