Merge remote-tracking branch 'origin/linebreak'

2014-05-30 13:06:25 -04:00
parent c0c43ef518 2d0b3482ec
commit 0dd78c96e3
10 changed files with 152 additions and 38 deletions
--- a/src/map/tile_parser.cpp
+++ b/src/map/tile_parser.cpp
@@ -242,7 +242,9 @@ std::unique_ptr<Bucket> TileParser::createTextBucket(const VectorTileLayer &laye
            const std::u32string string = ucs4conv.convert(source_string);

            // Shape labels.
-            const Shaping shaping = fontStack.getShaping(string);
+            const Shaping shaping = fontStack.getShaping(string, bucket_desc.geometry.max_width,
+                    bucket_desc.geometry.line_height, bucket_desc.geometry.alignment, 
+                    bucket_desc.geometry.vertical_alignment, bucket_desc.geometry.letter_spacing);

            // Place labels.
            addGlyph(tile.id.to_uint64(), bucket_desc.geometry.font, string, fontStack, *glyphAtlas,