Hermann Kraus
0c4d123602
Fix char spacing for scale_factor != 1.
2013-03-24 12:01:51 +01:00
Hermann Kraus
de837ba45d
Fix text rendering for scale_factor!=1.
2013-03-24 01:26:42 +01:00
Hermann Kraus
e5e9b9ea23
Add const qualifier to pixel_position operator~.
2013-03-24 01:01:13 +01:00
Hermann Kraus
5ce472cb4a
Merge branch 'master' into harfbuzz
2013-03-23 15:37:36 +01:00
Hermann Kraus
4beed29cf2
Merge commit 'aa122ea907fa1f31ed76f6e0f12ea9549c86a964' into harfbuzz
2013-03-23 15:32:15 +01:00
Hermann Kraus
95c0259a16
Merge commit '542805e4d6eb6672753bae45ac72887be279f9c7' into harfbuzz
...
Conflicts:
tests/visual_tests/test.py
2013-03-23 15:30:35 +01:00
Hermann Kraus
4aa2758f12
Merge commit 'f759964dbffd03457c0f13c467f1d890f759aff2' into harfbuzz
2013-03-23 14:42:55 +01:00
Hermann Kraus
9834fb73ed
Merge branch 'master' into harfbuzz
2013-03-23 14:39:04 +01:00
Hermann Kraus
62c381dfee
Merge commit '06803de192edc3a518f03e8c547b222e24993013' into harfbuzz
...
Conflicts:
include/mapnik/cairo_context.hpp
src/cairo_context.cpp
src/placement_finder.cpp
2013-03-23 14:38:56 +01:00
Hermann Kraus
cc4473cac9
Merge commit '5e224bd705b33a4574e379490a94d5063fdeaf00' into harfbuzz
2013-03-23 14:37:38 +01:00
Dane Springmeyer
f6870a6b70
correct the ltdl forward declare type
2013-03-22 19:47:57 -07:00
Hermann Kraus
290c2b4a26
Large manual merge. A lot of the changes could not be applied directly
...
as a different solution was used in the new branch.
Merge commit '6cbceafc45eda71ae379a3dfd7c52712ebe8422b' into harfbuzz
Conflicts:
include/mapnik/font_engine_freetype.hpp
src/font_engine_freetype.cpp
src/grid/process_text_symbolizer.cpp
2013-03-23 03:00:39 +01:00
Dane Springmeyer
aaecd92fb6
Merge branch 'master' of github.com:mapnik/mapnik
2013-03-22 17:58:49 -07:00
Dane Springmeyer
55ec6a7942
cleanups around exception handling
2013-03-22 17:58:33 -07:00
Dane Springmeyer
f9514e5d2c
formatting
2013-03-22 17:44:27 -07:00
Dane Springmeyer
3256037eb6
forward declare the lt_dlhandle type to avoid needing header in datasource_cache.hpp
2013-03-22 17:37:56 -07: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
6082f3dbb2
Merge commit 'f905632b920b130bfe19dd72d81882c10e1db179' into harfbuzz
2013-03-20 17:21:04 +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
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
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
3b807db7e1
avoid gcc unsigned/signed comparison warning
2013-03-18 16:54:26 -07: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
