85e075b8ea
Conflicts: bindings/python/mapnik_text_placement.cpp include/mapnik/font_engine_freetype.hpp include/mapnik/map.hpp include/mapnik/metawriter.hpp include/mapnik/metawriter_inmem.hpp include/mapnik/metawriter_json.hpp include/mapnik/placement_finder.hpp include/mapnik/symbolizer.hpp include/mapnik/symbolizer_helpers.hpp include/mapnik/text_properties.hpp src/agg/process_shield_symbolizer.cpp src/build.py src/cairo_renderer.cpp src/feature_style_processor.cpp src/grid/process_shield_symbolizer.cpp src/metawriter.cpp src/metawriter_inmem.cpp src/placement_finder.cpp src/processed_text.cpp src/symbolizer_helpers.cpp tests/visual_tests/images/lines-shield-200-reference.png tests/visual_tests/images/lines-shield-400-reference.png tests/visual_tests/images/lines-shield-600-reference.png tests/visual_tests/images/lines-shield-800-reference.png tests/visual_tests/styles/formatting.xml tests/visual_tests/test.py |
||
---|---|---|
.. | ||
expressionformat.xml | ||
formatting-1.xml | ||
formatting-2.xml | ||
formatting-3.xml | ||
formatting-4.xml | ||
formatting.xml | ||
harfbuzz.xml | ||
hb-fontsets.xml | ||
jalign-auto.xml | ||
khmer.xml | ||
line-offset.xml | ||
lines-1.xml | ||
lines-2.xml | ||
lines-3.xml | ||
lines-4.xml | ||
lines-5.xml | ||
lines-6.xml | ||
lines-shield.xml | ||
list.xml | ||
orientation.xml | ||
rtl-point.xml | ||
shieldsymbolizer-1.xml | ||
shieldsymbolizer-2.xml | ||
shieldsymbolizer-3.xml | ||
shieldsymbolizer-4.xml | ||
simple-E.xml | ||
simple-N.xml | ||
simple-NE.xml | ||
simple-NW.xml | ||
simple-S.xml | ||
simple-SE.xml | ||
simple-shield.xml | ||
simple-SW.xml | ||
simple-W.xml | ||
simple.xml |