From 066fa64dad2ad07da3500dc95604b7ae12544855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Tue, 15 Jul 2014 17:17:37 -0700
Subject: [PATCH] make icons work again

---
 src/geometry/sprite_atlas.cpp | 8 +++-----
 src/renderer/painter_icon.cpp | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/geometry/sprite_atlas.cpp b/src/geometry/sprite_atlas.cpp
index 733d587af..dbbbb419f 100644
--- a/src/geometry/sprite_atlas.cpp
+++ b/src/geometry/sprite_atlas.cpp
@@ -128,9 +128,7 @@ Rect<SpriteAtlas::dimension> SpriteAtlas::allocateImage(size_t width, size_t hei
 Rect<SpriteAtlas::dimension> SpriteAtlas::getIcon(const int size, const std::string &name) {
     std::lock_guard<std::mutex> lock(mtx);
 
-    const std::string id = name + "-" + std::to_string(size);
-
-    auto rect_it = images.find(id);
+    auto rect_it = images.find(name);
     if (rect_it != images.end()) {
         return rect_it->second;
     }
@@ -143,7 +141,7 @@ Rect<SpriteAtlas::dimension> SpriteAtlas::getIcon(const int size, const std::str
         return rect;
     }
 
-    images.emplace(id, rect);
+    images.emplace(name, rect);
 
     allocate();
 
@@ -158,7 +156,7 @@ Rect<SpriteAtlas::dimension> SpriteAtlas::getIcon(const int size, const std::str
         1.0f / size / pixelRatio
     );
 
-    uninitialized.emplace(id);
+    uninitialized.emplace(name);
 
     dirty = true;
 
diff --git a/src/renderer/painter_icon.cpp b/src/renderer/painter_icon.cpp
index 499b124fb..29e8af396 100644
--- a/src/renderer/painter_icon.cpp
+++ b/src/renderer/painter_icon.cpp
@@ -23,7 +23,7 @@ void Painter::renderIcon(IconBucket& bucket, std::shared_ptr<StyleLayer> layer_d
     useProgram(iconShader->program);
     iconShader->setMatrix(matrix);
 // TODO: update
-//    iconShader->setColor(color);
+    iconShader->setColor({{ 1, 1, 1, 1 }});
     iconShader->setImage(0);
     iconShader->setRatio(map.getState().getPixelRatio());
     iconShader->setDimension({{