sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6593 commits 112 branches 95 tags 181 MiB
Commit graph

2141 commits

Author SHA1 Message Date
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
aaaedcde70 Remove last usage of cairomm. Fixes a85ce71. 2013-03-17 12:34:45 +01:00
Hermann Kraus
3acbda57b9 Fix headers for 04c0fa0. 2013-03-17 12:34:45 +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
3f989cffb0 Merge commit '054cb132314accb7d3e81d0ccc22fd1cd5900687' into harfbuzz 2013-03-16 18:18:42 +01:00
Hermann Kraus
d7ebac77a3 Merge commit 'c3fab9e66502c135e4566005b63a63e04842ddf0' into harfbuzz 
Conflicts:
	include/mapnik/char_info.hpp
 2013-03-16 17:55:20 +01:00
Hermann Kraus
680b7f0ba2 Merge commit 'a1ea1701dd535e9d4e9b02167d4c9a13a30d4452' into harfbuzz 
Conflicts:
	include/mapnik/pixel_position.hpp
 2013-03-16 17:54:26 +01:00
Hermann Kraus
87395157c6 Merge commit 'bda0375f9728f3b8b2cc74d9338f9a84f527ba2f' into harfbuzz 
Conflicts:
	include/mapnik/font_engine_freetype.hpp
 2013-03-16 17:47:17 +01:00
Hermann Kraus
20ff37eb2d Merge commit '1454105b124daccc4d64654e11c442a2a1aa5008' into harfbuzz 
Conflicts:
	src/build.py
 2013-03-16 17:44:03 +01:00
Hermann Kraus
f9f01a4c5c Merge commit 'e5d1418417ee9c7549865e2018f12f4138f48414' into harfbuzz 
Conflicts:
	include/mapnik/processed_text.hpp
 2013-03-16 17:41:56 +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
b61500494b Merge commit 'f8b1520d1a0626f3e16e88ecf641be7222a9ceb6' into harfbuzz 
Conflicts:
	include/mapnik/map.hpp
 2013-03-16 16:20:58 +01:00
Hermann Kraus
793ec114e9 Merge commit '95b29f82b192f3aba6ef7efa57e4ac3ccb021910' into harfbuzz 2013-03-16 16:18:46 +01:00
Hermann Kraus
495bad25b6 Merge commit '3149c8db3d4fa0e536d18b8c189d7d6d96e1f1f7' into harfbuzz 
Conflicts:
	include/mapnik/text/formatting/base.hpp
	src/text/formatting/expression.cpp
 2013-03-16 16:15:42 +01:00
Hermann Kraus
c3de3398ca Merge commit 'ba6f3cf2caf46d967b49ac4a301b985d2a5761e9' into harfbuzz 
Conflicts:
	include/mapnik/symbolizer_helpers.hpp
	src/symbolizer_helpers.cpp
 2013-03-16 16:12:19 +01:00
Hermann Kraus
4699d2d0d6 Merge commit '70008ca78188a086174b003ef965a67a6e93e79e' into harfbuzz 2013-03-16 16:07:50 +01:00
Hermann Kraus
ea0daad8fc Merge commit 'e16567fecb3fd11960697663a955e5cf82225110' into harfbuzz 
Conflicts:
	src/cairo_context.cpp
	src/font_engine_freetype.cpp
	src/placement_finder.cpp
 2013-03-16 16:05:39 +01:00
Hermann Kraus
c70f4c2c2d Merge commit 'f483e590d846513c0ddc4e464139006a3f7cd917' into harfbuzz 2013-03-16 15:49:06 +01:00
Hermann Kraus
9f0a92069e Merge commit '7d62c3e8ba0593289dae57a2d8531a1c05ce4229' into harfbuzz 2013-03-16 15:41:40 +01:00
Hermann Kraus
04c0fa0767 Merge commit 'f25d4d9279fc99650b88d980a8c579a6b541d4b5' into harfbuzz 
Conflicts:
	src/cairo_renderer.cpp
 2013-03-16 15:40:54 +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
20272a7396 Merge commit 'a01a998aff27036ceee231ecc71156dcacc3e298' into harfbuzz 
Conflicts:
	include/mapnik/agg_renderer.hpp
	include/mapnik/text/text_properties.hpp
 2013-03-16 15:14:24 +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
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
784ef8f76a Merge commit 'a537c58afa450e1ffe6bbd8978d2e122b55c9942' into harfbuzz 
Conflicts:
	include/mapnik/symbolizer.hpp
 2013-03-16 12:24:02 +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
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
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