summaryrefslogtreecommitdiff
path: root/src/mbgl/sprite/sprite_atlas.hpp
diff options
context:
space:
mode:
authorAnsis Brammanis <brammanis@gmail.com>2016-01-12 12:58:55 -0800
committerAnsis Brammanis <brammanis@gmail.com>2016-01-13 14:48:07 -0800
commitbdfa1277a5c28bc68a35b7fe59572d030e0a8d9e (patch)
treedd812d26f19c48f7c8c389be121f95db7bbd88cc /src/mbgl/sprite/sprite_atlas.hpp
parent618902e06ca1287920154e81f3f95779fe9c96f4 (diff)
downloadqtlocation-mapboxgl-bdfa1277a5c28bc68a35b7fe59572d030e0a8d9e.tar.gz
[core] match icon rendering with -js
port https://github.com/mapbox/mapbox-gl-js/pull/1919/files
Diffstat (limited to 'src/mbgl/sprite/sprite_atlas.hpp')
-rw-r--r--src/mbgl/sprite/sprite_atlas.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp
index 167d012c6b..aca82b3fea 100644
--- a/src/mbgl/sprite/sprite_atlas.hpp
+++ b/src/mbgl/sprite/sprite_atlas.hpp
@@ -34,6 +34,7 @@ struct SpriteAtlasPosition {
struct SpriteAtlasElement {
const Rect<uint16_t> pos;
const std::shared_ptr<const SpriteImage> texture;
+ const float relativePixelRatio;
};
class SpriteAtlas : public util::noncopyable {
@@ -83,7 +84,7 @@ private:
using Key = std::pair<std::string, bool>;
- Rect<SpriteAtlas::dimension> allocateImage(size_t width, size_t height);
+ Rect<SpriteAtlas::dimension> allocateImage(float width, float height);
void copy(const Holder& holder, const bool wrap);
std::recursive_mutex mtx;