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

6698 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
f2ee8cae16 avoid signed/unsigned warning with llvm-g++ 2013-03-19 14:01:48 -07:00
Dane Springmeyer
faa78864b6 mapnik-config also add cxxflags to cflags for full backwards compatibility with previous behavior 2013-03-19 00:15:04 -07:00
Dane Springmeyer
3b807db7e1 avoid gcc unsigned/signed comparison warning 2013-03-18 16:54:26 -07:00
artemp
e91908206b cairo halo patch via @springmeyer ( #1624 ) 2013-03-18 14:31:38 +00:00
Hermann Kraus
a0ecc3d5bc Small fix for 59f2d77. 2013-03-17 12:34:45 +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
74cd52a10d Add missing includes. (Missing since at least 55d8492b7754ef135cbce1f47b26a8184423fa70.) 2013-03-17 12:34:44 +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
e1ca065be4 Merge commit 'cdee64709b8d344412b2de8015621dad45e8255c' into harfbuzz 
Conflicts:
	src/font_engine_freetype.cpp
 2013-03-16 18:19:58 +01:00
Hermann Kraus
3f989cffb0 Merge commit '054cb132314accb7d3e81d0ccc22fd1cd5900687' into harfbuzz 2013-03-16 18:18:42 +01:00
Hermann Kraus
5930da6be5 Merge commit '218aca2159af9b14fb5e263df674ca652bc18ef2' into harfbuzz 
Conflicts:
	include/mapnik/font_engine_freetype.hpp
 2013-03-16 18:15:37 +01:00
Hermann Kraus
1b6982e773 Merge commit 'be61bf6fef4d593c3d94701c66efc7404d442eee' into harfbuzz 
Conflicts:
	include/mapnik/text_path.hpp
	src/cairo_context.cpp
	src/font_engine_freetype.cpp
	src/placement_finder.cpp
 2013-03-16 18:14:57 +01:00
Hermann Kraus
3ca1f00487 Merge commit '3b5707848e8f1d06add0cf4e75ad1169368c68dd' into harfbuzz 
Conflicts:
	include/mapnik/text_path.hpp
 2013-03-16 18:14:04 +01:00
Hermann Kraus
59f2d776b4 Merge commit '1ea60c472c21db87f07cd81c4df440046a907cfd' into harfbuzz 
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	src/font_engine_freetype.cpp
 2013-03-16 18:13:37 +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
af6f87b195 Merge commit 'ea4b6d0802052425108efe836d70cf2b8c7dc70f' into harfbuzz 
Conflicts:
	src/font_engine_freetype.cpp
 2013-03-16 17:51:05 +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
c5bf8de5cb Merge commit '1ccd250980decbd547403265d29ad37e68e44ce5' into harfbuzz 
Conflicts:
	src/placement_finder.cpp
 2013-03-16 17:38:26 +01:00
Hermann Kraus
ff3c3ad97d Merge commit '1356775299bfd5806b76a4a8067b93fba03c7dca' into harfbuzz 2013-03-16 16:32:35 +01:00
Hermann Kraus
4957694bc7 Merge commit 'afa0c8ad27f3927c25c55ab134dcc30cc2d8b279' into harfbuzz 
Conflicts:
	SConstruct
 2013-03-16 16:30:19 +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
3709747329 Merge commit '7aab2bca4f6b6d9293181c5d3224284b802617c6' into harfbuzz 
Conflicts:
	include/mapnik/processed_text.hpp
	include/mapnik/symbolizer_helpers.hpp
 2013-03-16 15:44:42 +01:00
Hermann Kraus
a85ce712c6 Merge commit 'a0c758df9e635f8665625cc92c1e3581f2ec25d4' into harfbuzz 2013-03-16 15:42:21 +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
0227e67d5f Merge commit '35134b6b06f0e2f6ee10ed7c4a3d3d304975988e' into harfbuzz 2013-03-16 15:18:24 +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
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