summaryrefslogtreecommitdiff
path: root/src/map/map.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2014-11-28 17:23:05 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2014-12-02 12:24:25 -0800
commita6522d4a5aa894d260c3fbb246deba95b66061fd (patch)
treed05825100ebd29a1e108b72cd8aa1237adcb98dd /src/map/map.cpp
parent8fdf645e121034de2dd6ceca5e1c3bcd7c4c40a4 (diff)
downloadqtlocation-mapboxgl-a6522d4a5aa894d260c3fbb246deba95b66061fd.tar.gz
Texturepool ⇢ TexturePool (fixes #655)
Diffstat (limited to 'src/map/map.cpp')
-rw-r--r--src/map/map.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 259e212423..b3c83d1be6 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -17,7 +17,7 @@
#include <mbgl/geometry/glyph_atlas.hpp>
#include <mbgl/style/style_layer_group.hpp>
#include <mbgl/style/style_bucket.hpp>
-#include <mbgl/util/texturepool.hpp>
+#include <mbgl/util/texture_pool.hpp>
#include <mbgl/geometry/sprite_atlas.hpp>
#include <mbgl/storage/file_source.hpp>
#include <mbgl/platform/log.hpp>
@@ -94,7 +94,7 @@ Map::Map(View& view_)
transform(view_),
glyphAtlas(1024, 1024),
spriteAtlas(512, 512),
- texturepool(std::make_shared<Texturepool>()),
+ texturePool(std::make_shared<TexturePool>()),
painter(spriteAtlas, glyphAtlas)
{
view.initialize(this);
@@ -114,7 +114,7 @@ Map::~Map() {
sprite.reset();
glyphStore.reset();
style.reset();
- texturepool.reset();
+ texturePool.reset();
fileSource.reset();
workers.reset();
@@ -588,7 +588,7 @@ void Map::updateTiles() {
source->source->update(*this, getWorker(),
style, glyphAtlas, *glyphStore,
spriteAtlas, getSprite(),
- *texturepool, *fileSource, [this](){ update(); });
+ *texturePool, *fileSource, [this](){ update(); });
}
}