9e9747ffad
Conflicts: src/agg/process_building_symbolizer.cpp src/cairo_context.cpp src/cairo_renderer.cpp src/grid/process_building_symbolizer.cpp src/grid/process_line_pattern_symbolizer.cpp src/grid/process_text_symbolizer.cpp tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png tests/python_tests/images/support/marker-text-line-scale-factor-1.png tests/python_tests/images/support/marker-text-line-scale-factor-10.png tests/python_tests/images/support/marker-text-line-scale-factor-100.png tests/python_tests/images/support/marker-text-line-scale-factor-2.png tests/python_tests/images/support/marker-text-line-scale-factor-5.png tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png tests/visual_tests/test.py |
||
---|---|---|
.. | ||
aerial_rgba.tiff | ||
bug1532.osm | ||
bug1533.osm | ||
charplacement.dbf | ||
charplacement.shp | ||
charplacement.shx | ||
crossing-lines.csv | ||
displacement.dbf | ||
displacement.shp | ||
displacement.shx | ||
grouped-rendering.sqlite | ||
heat.tif | ||
heat_nodata.tif | ||
heat_rgb.tif | ||
hex.dbf | ||
hex.prj | ||
hex.shp | ||
hex.shx | ||
line-offset.csv | ||
line.dbf | ||
line.shp | ||
line.shx | ||
lines.csv | ||
lines2.csv | ||
lower_columbia.tif | ||
marker-multi-policy.csv | ||
marker-on-line.csv | ||
overlap.dbf | ||
overlap.shp | ||
overlap.shx | ||
pattern.png | ||
points.csv | ||
snow-cover.tif | ||
textspacing.dbf | ||
textspacing.shp | ||
textspacing.shx | ||
whole-centroid.csv | ||
Yosemite_L9.tfw | ||
Yosemite_L9.tif |