Hermann Kraus
7d34fb489a
Large merge with a lot of manual edits.
...
Test for grid renderer are failing atm.
Merge commit 'e66d00762754d1204204ccf122955116e5e9d017' into harfbuzz
Conflicts:
include/mapnik/font_engine_freetype.hpp
src/agg/process_shield_symbolizer.cpp
src/agg/process_text_symbolizer.cpp
src/font_engine_freetype.cpp
src/grid/process_shield_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/text_symbolizer.cpp
src/xml_tree.cpp
2013-03-20 03:47:20 +01:00
Hermann Kraus
16750433e2
Merge commit 'e5fd3675fab544fd34fe404425ed5287d39d9f24' into harfbuzz
2013-03-16 18:28:25 +01:00
Hermann Kraus
53320282f6
Merge commit '5e1a19cfda06382b34c8f6f6729b16a36543fc82' into harfbuzz
...
Conflicts:
tests/visual_tests/test.py
2013-03-16 18:26:08 +01:00
Hermann Kraus
f11616c644
Merge commit '6ffe78c30063ed30f82b48b32c8069a7e69a6edf' into harfbuzz
...
Conflicts:
tests/visual_tests/test.py
2013-03-16 18:23:17 +01:00
Hermann Kraus
346ce07117
Merge commit '88360c365f2ea288740db51e65588f839fc67bba' into harfbuzz
...
Conflicts:
include/mapnik/cairo_renderer.hpp
2013-03-16 18:21:59 +01:00
Hermann Kraus
20ff37eb2d
Merge commit '1454105b124daccc4d64654e11c442a2a1aa5008' into harfbuzz
...
Conflicts:
src/build.py
2013-03-16 17:44:03 +01:00
Hermann Kraus
dda1f51c51
Merge commit '1b3b598b80fa5632e16b379d92d21d5e24548975' into harfbuzz
2013-03-16 17:40:23 +01:00
Hermann Kraus
ab54c30e89
Merge commit 'cf11a27a227423c8419e279666d7463adc8b1736' into harfbuzz
2013-03-16 16:29:01 +01:00
Hermann Kraus
2ea4f748a2
Merge commit 'b1c1c86346d23042377deca1644e19959b93f68d' into harfbuzz
...
Conflicts:
SConstruct
2013-03-16 16:25:52 +01:00
Hermann Kraus
793ec114e9
Merge commit '95b29f82b192f3aba6ef7efa57e4ac3ccb021910' into harfbuzz
2013-03-16 16:18:46 +01:00
Hermann Kraus
4699d2d0d6
Merge commit '70008ca78188a086174b003ef965a67a6e93e79e' into harfbuzz
2013-03-16 16:07:50 +01:00
Hermann Kraus
c70f4c2c2d
Merge commit 'f483e590d846513c0ddc4e464139006a3f7cd917' into harfbuzz
2013-03-16 15:49:06 +01:00
Hermann Kraus
63acf3c248
Merge commit '0121f53f56327fda1aebb9d2e6c12aee07ef3b49' into harfbuzz
...
Conflicts:
include/mapnik/font_engine_freetype.hpp
2013-03-16 15:15:38 +01:00
Hermann Kraus
4484447774
Merge commit '70ef017f8ccbd2120b02fc7556808e541bc479a5' into harfbuzz
2013-03-16 13:35:21 +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
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
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
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
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
5e1a19cfda
update expected cairo rasters
2013-03-07 17:19:11 -08:00
Dane Springmeyer
b5e8129535
flag to overwrite expected visual test output
2013-03-07 17:19:00 -08:00
Dane Springmeyer
96c65979a1
first pass at a lower level set of clipping tests that avoid complexity of wkt and vertex converters - refs #1699
2013-03-07 13:31:32 -08:00
Dane Springmeyer
198dbcd4ca
fix raster alignment post #1748
2013-03-06 17:53:13 -08:00
Dane Springmeyer
c36795e0a9
respect both sx and sy in setting up affine transform for raster scaling since they may be different - closes #1748
2013-03-06 17:41:20 -08:00
Dane Springmeyer
20493ea54a
stop overwriting expected results
2013-03-06 17:32:14 -08:00
Dane Springmeyer
7a4b4a5d53
disable the mysteriously failing line-shields test - refs #1696
2013-03-06 11:33:20 -08:00
Dane Springmeyer
4922f76858
visual tests - stop testing agg v cairo and rather cairo v cairo - add test for #1600
2013-03-06 11:32:27 -08:00
Dane Springmeyer
c184579c43
finish hsla transformation image-filter
2013-02-28 12:19:40 -05:00
Dane Springmeyer
0aa81e75a7
add missing test file
2013-02-28 12:19:09 -05:00
Dane Springmeyer
00c2ff999d
fix all double to_string conversion failures by using sprintf method in all cases - closes #1741
2013-02-27 10:08:55 -05:00
Dane Springmeyer
ef021e84ad
comment out non-critical failing karma conversion to_string tests, leaving just single important failure - refs #1741
2013-02-27 09:40:16 -05:00
Dane Springmeyer
4d82a97814
implement support in cairo and grid renderer for mapnik::request - refs #1737
2013-02-26 15:05:44 -05:00
Dane Springmeyer
575164afb7
enable cairo in the cpp tests
2013-02-26 15:00:04 -05:00
Dane Springmeyer
00a2f54346
further refine the mapnik::request object which can be passed to custom agg_renderer
2013-02-25 19:33:08 -05:00
XinGang Li
666f27787b
Use path.join instead of string concatenation.
2013-02-23 17:35:31 +08:00
Dane Springmeyer
662ff26f94
im/view.is_solid method in python bindings to match node-mapnik - closes #1728
2013-02-22 13:40:05 -08:00
Dane Springmeyer
b5a74292a5
return stylename,styleo obj in tuple from map.styles - closes #1725 - amends 16ce1f5bdd
2013-02-22 13:39:14 -08:00
