diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-26 10:14:24 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-10 11:33:17 -0800 |
commit | a5625675890213f94de7632d4ef152ade627c9a5 (patch) | |
tree | d6a3f816e80417bbedc16d0b34383d8ee191bf92 /src/mbgl/map | |
parent | 728a9858ea88751e74de57694746c2ea1546ce25 (diff) | |
download | qtlocation-mapboxgl-a5625675890213f94de7632d4ef152ade627c9a5.tar.gz |
[core] Eliminate use of ClassProperties for layout
Diffstat (limited to 'src/mbgl/map')
-rw-r--r-- | src/mbgl/map/raster_tile_data.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/raster_tile_data.hpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/mbgl/map/raster_tile_data.cpp b/src/mbgl/map/raster_tile_data.cpp index 775619ff05..f29fa86b8e 100644 --- a/src/mbgl/map/raster_tile_data.cpp +++ b/src/mbgl/map/raster_tile_data.cpp @@ -55,7 +55,7 @@ void RasterTileData::request(float pixelRatio, state = State::loaded; } - workRequest = worker.parseRasterTile(std::make_unique<RasterBucket>(texturePool, layout), res.data, [this, callback] (RasterTileParseResult result) { + workRequest = worker.parseRasterTile(std::make_unique<RasterBucket>(texturePool), res.data, [this, callback] (RasterTileParseResult result) { workRequest.reset(); if (state != State::loaded) { return; diff --git a/src/mbgl/map/raster_tile_data.hpp b/src/mbgl/map/raster_tile_data.hpp index 64bcb777db..d03e3954ba 100644 --- a/src/mbgl/map/raster_tile_data.hpp +++ b/src/mbgl/map/raster_tile_data.hpp @@ -2,7 +2,6 @@ #define MBGL_MAP_RASTER_TILE_DATA #include <mbgl/map/tile_data.hpp> -#include <mbgl/style/style_properties.hpp> #include <mbgl/renderer/raster_bucket.hpp> #include <mbgl/storage/request_holder.hpp> @@ -32,7 +31,6 @@ private: Worker& worker; RequestHolder req; - RasterLayoutProperties layout; std::unique_ptr<Bucket> bucket; std::unique_ptr<WorkRequest> workRequest; |