diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-25 13:15:44 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-02 14:51:39 -0700 |
| commit | a43940afb2208c61b487bfd8729bbde1bd674794 (patch) | |
| tree | 53d192ea899be1d88f99aeef3d1b3255f9cb5104 /src/mbgl/util | |
| parent | 27baa34d44f0006c05ba7c417bf11e184b0bd22b (diff) | |
| download | qtlocation-mapboxgl-a43940afb2208c61b487bfd8729bbde1bd674794.tar.gz | |
[core] Runtime style layer API
Diffstat (limited to 'src/mbgl/util')
| -rw-r--r-- | src/mbgl/util/worker.cpp | 6 | ||||
| -rw-r--r-- | src/mbgl/util/worker.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/util/worker.cpp b/src/mbgl/util/worker.cpp index e116d3f6c6..43abe6792a 100644 --- a/src/mbgl/util/worker.cpp +++ b/src/mbgl/util/worker.cpp @@ -4,7 +4,7 @@ #include <mbgl/platform/platform.hpp> #include <mbgl/renderer/raster_bucket.hpp> #include <mbgl/tile/geometry_tile.hpp> -#include <mbgl/style/style_layer.hpp> +#include <mbgl/style/layer.hpp> #include <mbgl/text/collision_tile.hpp> #include <cassert> @@ -30,7 +30,7 @@ public: } void parseGeometryTile(TileWorker* worker, - std::vector<std::unique_ptr<StyleLayer>> layers, + std::vector<std::unique_ptr<Layer>> layers, std::unique_ptr<GeometryTile> tile, PlacementConfig config, std::function<void(TileParseResult)> callback) { @@ -79,7 +79,7 @@ Worker::parseRasterTile(std::unique_ptr<RasterBucket> bucket, std::unique_ptr<AsyncRequest> Worker::parseGeometryTile(TileWorker& worker, - std::vector<std::unique_ptr<StyleLayer>> layers, + std::vector<std::unique_ptr<Layer>> layers, std::unique_ptr<GeometryTile> tile, PlacementConfig config, std::function<void(TileParseResult)> callback) { diff --git a/src/mbgl/util/worker.hpp b/src/mbgl/util/worker.hpp index e07b8b8b44..68625f42bf 100644 --- a/src/mbgl/util/worker.hpp +++ b/src/mbgl/util/worker.hpp @@ -40,7 +40,7 @@ public: std::function<void(RasterTileParseResult)> callback); Request parseGeometryTile(TileWorker&, - std::vector<std::unique_ptr<StyleLayer>>, + std::vector<std::unique_ptr<Layer>>, std::unique_ptr<GeometryTile>, PlacementConfig, std::function<void(TileParseResult)> callback); |