diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-13 16:05:26 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-14 16:28:12 -0600 |
| commit | d819ece74c52658c68d4e297c9bef5a74f739e28 (patch) | |
| tree | 3f5af4a976546db7b811522c62c5ab0b504837a2 /src/mbgl/programs/line_program.cpp | |
| parent | 58de1e15c5e3f4983f445eacefb2fcc931371788 (diff) | |
| download | qtlocation-mapboxgl-d819ece74c52658c68d4e297c9bef5a74f739e28.tar.gz | |
[core] Combine SpriteAtlas::getPosition with SpriteAtlas::getImage
Diffstat (limited to 'src/mbgl/programs/line_program.cpp')
| -rw-r--r-- | src/mbgl/programs/line_program.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/programs/line_program.cpp b/src/mbgl/programs/line_program.cpp index 8a26c88aea..d9778ba7ce 100644 --- 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] |