diff options
| author | Leo Lou <louyuhong@gmail.com> | 2014-08-21 18:37:01 +0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-08-22 09:31:30 -0700 |
| commit | c6a947de127ca1bb224bf1c0e74265300981423c (patch) | |
| tree | 5d485c8b3f21a450ab4ae289e71023e03d4b52ff | |
| parent | 0168612ed311cf71802575aa3fb886edf2ca62fe (diff) | |
| download | qtlocation-mapboxgl-c6a947de127ca1bb224bf1c0e74265300981423c.tar.gz | |
Use float for pixelRatio
| -rw-r--r-- | include/mbgl/map/sprite.hpp | 4 | ||||
| -rw-r--r-- | src/map/sprite.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/map/sprite.hpp b/include/mbgl/map/sprite.hpp index 967f1d6614..7bc6665570 100644 --- a/include/mbgl/map/sprite.hpp +++ b/include/mbgl/map/sprite.hpp @@ -19,7 +19,7 @@ class FileSource; class SpritePosition { public: explicit SpritePosition() {} - explicit SpritePosition(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t pixelRatio = 1); + explicit SpritePosition(uint16_t x, uint16_t y, uint16_t width, uint16_t height, float pixelRatio = 1.0f); operator bool() const { return !(width == 0 && height == 0 && x == 0 && y == 0); @@ -27,7 +27,7 @@ public: uint16_t x = 0, y = 0; uint16_t width = 0, height = 0; - uint8_t pixelRatio = 1; + float pixelRatio = 1.0f; }; class Sprite : public std::enable_shared_from_this<Sprite>, private util::noncopyable { diff --git a/src/map/sprite.cpp b/src/map/sprite.cpp index 88e940c00e..a8f4f97185 100644 --- a/src/map/sprite.cpp +++ b/src/map/sprite.cpp @@ -13,7 +13,7 @@ using namespace mbgl; -SpritePosition::SpritePosition(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t pixelRatio) +SpritePosition::SpritePosition(uint16_t x, uint16_t y, uint16_t width, uint16_t height, float pixelRatio) : x(x), y(y), width(width), @@ -122,7 +122,7 @@ void Sprite::parseJSON() { uint16_t y = 0; uint16_t width = 0; uint16_t height = 0; - uint8_t pixelRatio = 1; + float pixelRatio = 1.0f; if (value.HasMember("x")) x = value["x"].GetInt(); if (value.HasMember("y")) y = value["y"].GetInt(); |