[core] Combine SpriteAtlas::getPosition with SpriteAtlas::getImage

2017-02-13 16:05:26 -08:00
parent 58de1e15c5
commit d819ece74c
11 changed files with 50 additions and 60 deletions
--- a/src/mbgl/programs/line_program.cpp
+++ b/src/mbgl/programs/line_program.cpp
@@ -88,8 +88,8 @@ LinePatternProgram::uniformValues(const LinePaintProperties::Evaluated& properti
                                  const RenderTile& tile,
                                  const TransformState& state,
                                  const std::array<float, 2>& pixelsToGLUnits,
-                                  const SpriteAtlasPosition& posA,
-                                  const SpriteAtlasPosition& posB) {
+                                  const SpriteAtlasElement& posA,
+                                  const SpriteAtlasElement& posB) {
     std::array<float, 2> sizeA {{
         tile.id.pixelsToTileUnits(posA.size[0] * properties.get<LinePattern>().fromScale, state.getIntegerZoom()),
         posA.size[1]