Commit graph

6771 commits

Author SHA1 Message Date
artemp
16bfb3e728 + update FSF address 2013-03-22 08:32:08 +00:00
artemp
fe092ac7a2 + implement offset
```
offset = "<number> | <percentage>"
```
2013-03-21 12:10:08 +00:00
artemp
542805e4d6 + support multiple color stops in colorize-alpha
( TODO: add support for:  <color-stop>     = <color> [ <percentage> | <length> ]? )
2013-03-20 17:21:09 +00:00
Hermann Kraus
ef2a1da052 Merge commit '20fcdc80348f4f44944a1eeeabacd021aa051288' into harfbuzz
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	src/agg/process_shield_symbolizer.cpp
	src/font_engine_freetype.cpp
	src/grid/process_shield_symbolizer.cpp
	src/symbolizer_helpers.cpp
2013-03-20 17:32:50 +01:00
Hermann Kraus
0f7101b9b5 Merge commit '71a04cd09da21680b6ad498fe4985eb157f34f35' into harfbuzz 2013-03-20 17:31:25 +01:00
Hermann Kraus
7ce1433675 Merge commit '3bc45ca7ced658537fc288948f3a7976674c50d5' into harfbuzz
Conflicts:
	src/font_engine_freetype.cpp
2013-03-20 17:29:54 +01:00
Hermann Kraus
0398e300af Merge commit 'db437be302e803c70a13038697c86d19d1eddb98' into harfbuzz
Conflicts:
	src/font_engine_freetype.cpp
2013-03-20 17:26:51 +01:00
Hermann Kraus
6082f3dbb2 Merge commit 'f905632b920b130bfe19dd72d81882c10e1db179' into harfbuzz 2013-03-20 17:21:04 +01:00
Hermann Kraus
03b8ee4178 Merge commit '1ed656831dc9a19cfdb67529d84d2762697a6f19' into harfbuzz
Conflicts:
	tests/visual_tests/images/expressionformat-500-reference.png
	tests/visual_tests/images/formatting-1-500-reference.png
	tests/visual_tests/images/formatting-2-500-reference.png
	tests/visual_tests/images/formatting-3-500-reference.png
	tests/visual_tests/images/jalign-auto-200-reference.png
	tests/visual_tests/images/line-offset-900-reference.png
	tests/visual_tests/images/lines-1-200-reference.png
	tests/visual_tests/images/lines-1-400-reference.png
	tests/visual_tests/images/lines-1-600-reference.png
	tests/visual_tests/images/lines-1-800-reference.png
	tests/visual_tests/images/lines-2-200-reference.png
	tests/visual_tests/images/lines-2-400-reference.png
	tests/visual_tests/images/lines-2-600-reference.png
	tests/visual_tests/images/lines-2-800-reference.png
	tests/visual_tests/images/lines-3-200-reference.png
	tests/visual_tests/images/lines-3-400-reference.png
	tests/visual_tests/images/lines-3-600-reference.png
	tests/visual_tests/images/lines-3-800-reference.png
	tests/visual_tests/images/lines-shield-200-reference.png
	tests/visual_tests/images/lines-shield-400-reference.png
	tests/visual_tests/images/lines-shield-600-reference.png
	tests/visual_tests/images/lines-shield-800-reference.png
	tests/visual_tests/images/list-100-reference.png
	tests/visual_tests/images/list-150-reference.png
	tests/visual_tests/images/list-250-reference.png
	tests/visual_tests/images/list-300-reference.png
	tests/visual_tests/images/list-400-reference.png
	tests/visual_tests/images/list-600-reference.png
	tests/visual_tests/images/list-800-reference.png
	tests/visual_tests/images/rtl-point-200-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-490-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-495-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-498-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-500-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-501-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-502-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-505-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-510-reference.png
	tests/visual_tests/images/simple-100-reference.png
	tests/visual_tests/images/simple-150-reference.png
	tests/visual_tests/images/simple-250-reference.png
	tests/visual_tests/images/simple-300-reference.png
	tests/visual_tests/images/simple-400-reference.png
	tests/visual_tests/images/simple-600-reference.png
	tests/visual_tests/images/simple-800-reference.png
	tests/visual_tests/images/simple-E-500-reference.png
	tests/visual_tests/images/simple-N-500-reference.png
	tests/visual_tests/images/simple-NE-500-reference.png
	tests/visual_tests/images/simple-NW-500-reference.png
	tests/visual_tests/images/simple-S-500-reference.png
	tests/visual_tests/images/simple-SE-500-reference.png
	tests/visual_tests/images/simple-SW-500-reference.png
	tests/visual_tests/images/simple-W-500-reference.png
	tests/visual_tests/test.py
2013-03-20 17:19:57 +01:00
Hermann Kraus
e673051de5 Reenable grid tests. 2013-03-20 17:15:36 +01:00
Hermann Kraus
f992927cd3 Merge commit '631923e675b486583dbded735b7df4dca6b7cd0b' into hb-test2
Conflicts:
	src/font_engine_freetype.cpp
2013-03-20 17:15:02 +01:00
artemp
4b713f6ed0 + impl colorize-alpha image filter
NOTE:currently linear interpolation between two colours only
  TODO:support multiple colour stops : https://developer.mozilla.org/en-US/docs/CSS/linear-gradient
2013-03-20 15:17:41 +00:00
Hermann Kraus
98f6d3a5e3 Merge commit '464a1f176b71214b0cb5b224eaf944b4cc3cd0f4' into hb-test2 2013-03-20 14:15:54 +01:00
Hermann Kraus
9489cd5538 Add missing test cases. 2013-03-20 03:50:57 +01:00
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
feaf757c07 Fix return type. 2013-03-20 03:45:33 +01:00
Dane Springmeyer
4e6b6d5a62 ensure the line clipping box is padded using scale_factor as well - closes #1767 2013-03-19 16:15:50 -07:00
Dane Springmeyer
25591cfcbf replace one more cairo/halo image 2013-03-19 14:24:05 -07:00
Dane Springmeyer
e47f3e635c remove explicit keyword on boolean to make llvm-gcc happy on os x 2013-03-19 14:10:01 -07:00
Dane Springmeyer
5ceecd40a3 avoid ambiguity between boost::python::range and boost::range - fixes compile error with llvm-gcc 2013-03-19 14:09:36 -07:00
Dane Springmeyer
a7ef5c7f60 avoid copying of non-copyable transcoder class - fixes compile with llvm-gcc 2013-03-19 14:09:01 -07:00
Dane Springmeyer
fd186d1b79 fix expected cairo/text halo rendering tests after #1624 2013-03-19 14:07:30 -07:00
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