Hermann Kraus
363ab5b47a
Merge commit '900b6172bfc4be5b706600b49a587de40e6cf673' into harfbuzz
...
Conflicts:
include/mapnik/placement_finder.hpp
2013-03-16 15:12:33 +01:00
Hermann Kraus
2735b47bd3
Merge commit 'eb15d0bd8a9a748b2381c9e09575a98f3c5861f5' into harfbuzz
2013-03-16 15:11:12 +01:00
Hermann Kraus
a5c3d100dd
Merge commit '9c3dba905bb3d489c0b7a20bc8232d5133225ab9' into harfbuzz
...
Conflicts:
include/mapnik/text/formatting/base.hpp
include/mapnik/text/formatting/expression_format.hpp
include/mapnik/text/formatting/format.hpp
include/mapnik/text/formatting/list.hpp
include/mapnik/text/formatting/text.hpp
2013-03-16 15:09:11 +01:00
Hermann Kraus
475502af00
Merge commit '09c8b876fda07c9268d2fe718a230a753296242f' into harfbuzz
2013-03-16 13:36:06 +01:00
Hermann Kraus
4484447774
Merge commit '70ef017f8ccbd2120b02fc7556808e541bc479a5' into harfbuzz
2013-03-16 13:35:21 +01:00
Hermann Kraus
6b573bdf47
Merge commit '17b0b1eeb1ea2b15f1ff0d202b862d3a6844fea0' into harfbuzz
...
Conflicts:
src/symbolizer_helpers.cpp
2013-03-16 13:33:25 +01:00
Hermann Kraus
1e67ba63cd
Merge commit 'e9343ca32ca73f19213da5ae41e9b25908c716b0' into harfbuzz
...
Conflicts:
src/placement_finder.cpp
src/text/text_properties.cpp
2013-03-16 13:30:03 +01:00
Hermann Kraus
701a407087
Merge commit 'a75cfa111bb1bf943acf92df0a4d2490a5e8ef72' into harfbuzz
...
Conflicts:
src/text/formatting/expression.cpp
src/text/formatting/format.cpp
src/text/formatting/list.cpp
src/text/formatting/text.cpp
2013-03-16 13:25:44 +01:00
Hermann Kraus
25d00ad26f
Merge commit '32760318a4905efa45bb459d891e5e7ec1a7bf2a' into harfbuzz
...
Conflicts:
include/mapnik/font_engine_freetype.hpp
include/mapnik/text/formatting/base.hpp
include/mapnik/text/formatting/list.hpp
include/mapnik/text/text_properties.hpp
src/font_engine_freetype.cpp
src/grid/process_shield_symbolizer.cpp
src/symbolizer_helpers.cpp
src/text/formatting/expression.cpp
src/text/formatting/format.cpp
src/text/formatting/list.cpp
src/text/text_properties.cpp
2013-03-16 13:19:06 +01:00
Hermann Kraus
fe54e4a6a1
Merge commit '6b7c16297032aa24bab0950b2a837e58c7d52c86' into harfbuzz
...
Conflicts:
src/grid/process_shield_symbolizer.cpp
2013-03-16 13:13:14 +01:00
Hermann Kraus
438e2c4de7
Merge commit 'bb27156df0a111fdecfe87b48d27b2866b7a2816' into harfbuzz
...
Conflicts:
include/mapnik/font_engine_freetype.hpp
include/mapnik/grid/grid_renderer.hpp
include/mapnik/placement_finder.hpp
include/mapnik/processed_text.hpp
include/mapnik/text/formatting/registry.hpp
include/mapnik/text/placements/registry.hpp
include/mapnik/text_path.hpp
2013-03-16 13:11:29 +01:00
Hermann Kraus
723b89f151
Merge commit '6b84269343cbd7a8aa165e3b4788d6a64b6c1e55' into harfbuzz
...
Conflicts:
src/placement_finder.cpp
2013-03-16 13:06:39 +01:00
Hermann Kraus
77fadc8209
Merge commit '562fada9d0f680f59b2d9f396c95320a0d753479' into harfbuzz
2013-03-16 13:03:11 +01:00
Hermann Kraus
4a6eab2d85
Merge commit 'c0021d0760ec85ace3b0a9a480d351cfd0f0ce91' into harfbuzz
...
Conflicts:
include/mapnik/font_engine_freetype.hpp
2013-03-16 13:01:15 +01:00
Hermann Kraus
90f0287a21
Merge commit '95ceee84fac2cd9dffad0931889522a87c723537' into harfbuzz
...
Conflicts:
src/cairo_renderer.cpp
2013-03-16 12:59:07 +01:00
Hermann Kraus
a2aaea1cd0
Merge commit '1d114b5e2fd4b5f9cd64013d3eec89fd00d580a5' into harfbuzz
2013-03-16 12:47:52 +01:00
Hermann Kraus
df7c2b5c0e
Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz
...
Conflicts:
tests/visual_tests/test.py
2013-03-16 12:46:01 +01:00
Hermann Kraus
4d54696265
Merge commit '8dca9dbb2b9012caf9d37ae60906756aa6c0e037' into harfbuzz
...
Conflicts:
src/agg/process_shield_symbolizer.cpp
src/grid/process_shield_symbolizer.cpp
2013-03-16 12:44:46 +01:00
Hermann Kraus
0c62b481f6
Merge commit 'cd064305fc8cf7fee1806e495d9016a5ce1e5d7f' into harfbuzz
...
Conflicts:
src/cairo_renderer.cpp
2013-03-16 12:44:01 +01:00
Hermann Kraus
a9973837ef
Merge commit '0b9ebe21dd593b9b87c6388291b79a5c5a4af4e4' into harfbuzz
...
Conflicts:
tests/visual_tests/test.py
2013-03-16 12:39:47 +01:00
Hermann Kraus
55d8492b77
Merge commit 'e2a76e09b3e3614174d24aa43165151f599c9d8e' into harfbuzz
...
Conflicts:
src/agg/process_text_symbolizer.cpp
src/cairo_renderer.cpp
2013-03-16 12:38:22 +01:00
Hermann Kraus
ad905f1ff8
Merge commit '00517a507f68237874630dae1821c8a2c844bc3d' into harfbuzz
...
Conflicts:
tests/visual_tests/test.py
2013-03-16 12:34:59 +01:00
Hermann Kraus
c4cdd89076
Merge commit 'b9b97ba6526aebbe920e0bd29b8dc8dc35267cfc' into harfbuzz
...
Conflicts:
src/load_map.cpp
2013-03-16 12:31:56 +01:00
Hermann Kraus
d522d997e8
Merge commit '4432b75f53b30d02ecf5add1e84f6b78cd572f98' into harfbuzz
...
Conflicts:
tests/visual_tests/test.py
2013-03-16 12:28:15 +01:00
Hermann Kraus
784ef8f76a
Merge commit 'a537c58afa450e1ffe6bbd8978d2e122b55c9942' into harfbuzz
...
Conflicts:
include/mapnik/symbolizer.hpp
2013-03-16 12:24:02 +01:00
Hermann Kraus
606361b75c
Merge commit '940bb9827585885c6eaef9b1d4c62a38f4e81ea9' into harfbuzz
...
Conflicts:
tests/visual_tests/test.py
2013-03-16 12:21:31 +01:00
Hermann Kraus
3ea335af66
Merge commit '7cf4a00af9530ba2aa46ba1a4a5cb2cb41fe166a' into harfbuzz
2013-03-16 12:13:11 +01:00
Dane Springmeyer
71a04cd09d
pass optional by const ref
2013-03-12 16:56:31 -07:00
Dane Springmeyer
86ad6c0dab
snap to pixels for markers because calculating placement
2013-03-12 12:14:01 -07:00
Dane Springmeyer
1bf3e89de0
tests: if palette comparison fails print file names
2013-03-11 15:58:19 -07:00
Dane Springmeyer
3bc45ca7ce
code cleanup
2013-03-11 15:25:46 -07:00
Dane Springmeyer
db437be302
remove unneeded FT_Glyph_Copy for grid_renderer halo rendering - refs #1751
2013-03-11 15:24:49 -07:00
Dane Springmeyer
f905632b92
visual testcase for #1744
2013-03-11 15:09:04 -07:00
Dane Springmeyer
29ce3b1c75
fix handling of svg opacity, which should be applied to fill/stroke opacity at render time - closes #1744
2013-03-11 14:56:00 -07:00
Dane Springmeyer
3b834b4e6f
formatting
2013-03-11 13:46:32 -07:00
Dane Springmeyer
1ed656831d
start testing scale_factor - overwrite all expected results
2013-03-11 13:36:31 -07:00
Dane Springmeyer
5b3cca9d44
remove used variables
2013-03-11 12:59:11 -07:00
Dane Springmeyer
6ce9040915
limit to 2 concurrent jobs on travis
2013-03-11 11:53:56 -07:00
Dane Springmeyer
3dce57cf68
Merge branch 'master' of github.com:mapnik/mapnik
2013-03-11 11:44:31 -07:00
Dane Springmeyer
631923e675
fix handling of alpha in fast halo renderer - refs #1298 , amends e66d007627
2013-03-11 11:43:35 -07:00
Dane Springmeyer
464a1f176b
Merge branch 'master' of https://github.com/mapnik/mapnik
2013-03-11 08:12:40 -07:00
artemp
4bdc5cdc10
+ boost.geometry based polygon clipper
...
(NOTE: subject polygons must be 'valid' as in OGC world)
2013-03-11 09:44:20 +00:00
Dane Springmeyer
a7af47b730
enable snprintf for windows
2013-03-10 12:56:31 -07:00
Dane Springmeyer
210840721f
set dimensions of svg
2013-03-08 21:03:41 -08:00
Dane Springmeyer
b8de6e6f34
no need for an intermediate bbox for rasters
2013-03-08 20:55:45 -08:00
Dane Springmeyer
e66d007627
add halo-rasterizer option for text symbolizer
...
- closes #1298
- allows for much faster halo drawing and simliar quality for
radius values in the 1-2 px range
- also moves grid_renderer away from using freetype stroker completely
since halo quality is not critical for this renderer
2013-03-08 20:32:39 -08:00
Dane Springmeyer
e5fd3675fa
return 9999 for diff of failed grid comparison
2013-03-08 20:28:32 -08:00
Dane Springmeyer
76042a1700
parse and setup ability to known original, declared svg width/height - refs #1122
2013-03-08 17:40:19 -08:00
Dane Springmeyer
2fcd531345
pixel snap raster markers and svg files loaded from the file system - partially addresses #1316
2013-03-08 16:24:41 -08:00
Dane Springmeyer
5e1a19cfda
update expected cairo rasters
2013-03-07 17:19:11 -08:00
