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

2267 commits

Author SHA1 Message Date
Hermann Kraus
55ce673a8c Restructure shaping code in preparation for optimizations. 2013-04-02 07:02:01 +02:00
Hermann Kraus
47e02ada84 Fix text rendering in grid renderer. 2013-04-02 05:01:07 +02:00
Hermann Kraus
2ee899100a Show missing glyphs by rendering boxes instead of dropping the whole text. 2013-04-02 02:06:53 +02:00
Hermann Kraus
7754f37772 Implement upright=right_only/left_only. 
Closes #1533.
 2013-04-01 22:30:19 +02:00
Hermann Kraus
e4ad657991 Fix critial bug in text itemizer. 
Itemizations is invalid after changing text, therefore lists have to be cleared.
 2013-04-01 21:47:48 +02:00
Hermann Kraus
74d72b9191 Fix glyph widths after line breaking. 
Fixes #1532.
 2013-04-01 02:21:05 +02:00
Hermann Kraus
cc122d3768 Include missing header. 2013-03-30 16:10:52 +01:00
Hermann Kraus
779adfdf4b Add copyright notices. 2013-03-30 16:03:54 +01:00
Hermann Kraus
089ca7d91d Cache offseted lines. Reduces render times by 50% in certain tests. 2013-03-30 16:03:48 +01:00
Hermann Kraus
d7553fb93c Move vertex_cache functions from .hpp to .cpp. 2013-03-30 12:45:46 +01:00
Hermann Kraus
7205d04026 Fix wrong position calculation after c84d83a685 changed the reference point. 2013-03-29 02:54:35 +01:00
Hermann Kraus
e53d1d4717 Fix copying of text_symbolizer_properties in one place. 
Needs a more general solution.
Refs #1780.
 2013-03-29 01:52:16 +01:00
Hermann Kraus
b4e10cfb77 Merge branch 'master' into harfbuzz 2013-03-28 12:22:31 +01:00
Hermann Kraus
6153c737e6 Fix checks in Map::resize(). 2013-03-28 10:55:10 +01:00
artemp
9b138728d0 + fix assignment operator #1776 2013-03-27 10:39:02 +00:00
kunitoki
af2bb2be1e - avoid using double quotes when already escaping as string 2013-03-27 09:02:03 +01:00
Dane Springmeyer
412aa510a1 fix jpeg/tiff error handling on failed reads - closes #1775 2013-03-25 18:29:29 -07:00
Hermann Kraus
d185e17f71 Handle glyph offsets in cairo renderer. 2013-03-26 01:01:44 +01:00
Hermann Kraus
29009b14bb Fix shield displacement for scale_factor != 1. 
All visual AGG test pass.
 2013-03-25 02:11:24 +01:00
Hermann Kraus
f3cf17728b Fix PointSymbolizer collision bounding boxes. 2013-03-24 15:57:54 +01:00
Hermann Kraus
e6b7525d34 Merge branch 'master' into harfbuzz 2013-03-24 15:51:03 +01:00
Hermann Kraus
fe526fd3d6 Fix PointSymbolizer collision bounding boxes. 2013-03-24 15:50:18 +01:00
Hermann Kraus
722b84e53a Yet another character_spacing/scale_factor fix. 2013-03-24 15:37:06 +01:00
Hermann Kraus
5f46e45fc9 boost::noncopyable -> mapnik::noncopyable 2013-03-24 15:10:09 +01:00
Hermann Kraus
1d5ebcb64e More scale_factor fixes. 2013-03-24 15:07:42 +01:00
Hermann Kraus
23b794c67c Implement char_spacing for line placements. 2013-03-24 12:36:57 +01:00
Hermann Kraus
0c4d123602 Fix char spacing for scale_factor != 1. 2013-03-24 12:01:51 +01:00
Hermann Kraus
51832de841 Apply scale factor to halo_radius. 2013-03-24 01:41:33 +01:00
Hermann Kraus
de837ba45d Fix text rendering for scale_factor!=1. 2013-03-24 01:26:42 +01:00
Hermann Kraus
3be7b55459 Fix position calculation for text in cairo renderer. 2013-03-24 01:01:37 +01:00
Hermann Kraus
d1a0fcb7a7 Fix build failures introduced by merges. 2013-03-23 23:48:10 +01:00
Hermann Kraus
5ce472cb4a Merge branch 'master' into harfbuzz 2013-03-23 15:37:36 +01:00
Hermann Kraus
7fae143b58 Merge commit 'c84d83a685ba0e201b055db5a7cee68afde05d64' into harfbuzz 
Conflicts:
	src/cairo_renderer.cpp
 2013-03-23 15:37:05 +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
1df49735f8 Manual merge. 
Merge commit 'e91908206baf0535934a985f8e0d54db2d67ea88' into harfbuzz

Conflicts:
	src/cairo_context.cpp
 2013-03-23 15:29:02 +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
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
c84d83a685 + fix raster markers positioning 2013-03-22 12:16:23 +00:00
artemp
aa122ea907 + local vars locality 2013-03-22 11:54:34 +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