Hermann Kraus
|
18b6567e62
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-09-15 01:41:02 +02:00 |
|
Hermann Kraus
|
406904a1f6
|
Merge branch 'master' into harfbuzz
Conflicts:
bindings/python/mapnik/__init__.py
include/mapnik/font_engine_freetype.hpp
src/load_map.cpp
|
2012-09-15 01:39:33 +02:00 |
|
Dane Springmeyer
|
56585d11d9
|
when using style level compositing or image filters still trigger style processing callbacks even if we return without querying the data if there are active rules - closes #1477
|
2012-09-14 16:13:37 -07:00 |
|
Dane Springmeyer
|
1b3dcda87d
|
add method off style to check for active rules
|
2012-09-14 16:11:37 -07:00 |
|
Dane Springmeyer
|
9b5189abf0
|
sqlite: improve the error when no key_field is set and the primary key cannot be autodetected
|
2012-09-14 16:10:51 -07:00 |
|
Hermann Kraus
|
1940014a48
|
Remove deprecation warnings.
|
2012-09-14 23:25:32 +02:00 |
|
Dane Springmeyer
|
8cfb40ae2f
|
refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance)
|
2012-09-14 14:17:45 -07:00 |
|
Dane Springmeyer
|
4973136207
|
Add a test (currently failing) ensuring that named fontsets created in python are propertly serialized
|
2012-09-14 12:27:55 -07:00 |
|
Dane Springmeyer
|
73ae407156
|
rename fontset test to be consistencly named
|
2012-09-14 12:07:07 -07:00 |
|
Hermann Kraus
|
dc6ecc4be7
|
Reenable wrap-before and add tests for it.
|
2012-09-14 18:53:52 +02:00 |
|
Hermann Kraus
|
e5351ced6f
|
Add missing reference images.
|
2012-09-14 18:05:52 +02:00 |
|
Dane Springmeyer
|
4d5ab83fb3
|
add harfbuzz custom paths to environment
|
2012-09-14 08:55:01 -07:00 |
|
artemp
|
fb8f50b0f5
|
Merge branch 'master' into conv_simplify
|
2012-09-14 13:15:42 +01:00 |
|
artemp
|
d42c88ab4a
|
+ check sleve_cont has at least two vertices
|
2012-09-14 13:12:53 +01:00 |
|
Dane Springmeyer
|
82905e6048
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2012-09-13 18:24:49 -07:00 |
|
Dane Springmeyer
|
3e3973259e
|
update changelog after #1466
|
2012-09-13 18:24:33 -07:00 |
|
Hermann Kraus
|
d181313e90
|
Add TextSymbolizer.name in python bindings.
Refs #1482.
|
2012-09-14 01:56:35 +02:00 |
|
Hermann Kraus
|
6d9c808b6d
|
Fix all reference to points.shp.
Add new character spacing test.
|
2012-09-13 23:35:42 +02:00 |
|
Hermann Kraus
|
0615609e67
|
Fix python bindings.
|
2012-09-13 23:11:27 +02:00 |
|
Dane Springmeyer
|
2ded86629f
|
scons: do not invoke any install or uninstall targets if using SYSTEM_FONTS - closes #1481
|
2012-09-13 13:40:15 -07:00 |
|
artemp
|
820a0e92ab
|
+ discard 'almost' adjacent vertices
+ enforce 'min_size' in output path
|
2012-09-13 15:41:51 +01:00 |
|
artemp
|
f66d4b1afe
|
Merge branch 'master' into conv_simplify
|
2012-09-13 08:50:59 +01:00 |
|
Dane Springmeyer
|
2a3a402f5d
|
finish fixing pixel alignment for raster rendering in cairo - closes #1471
|
2012-09-12 13:25:40 -07:00 |
|
Dane Springmeyer
|
61e8a9c236
|
no need for premultiplied types in warper
|
2012-09-12 13:22:37 -07:00 |
|
Dane Springmeyer
|
1b4e7a8fd5
|
the blender is not called when scaling and if it were using pixfmt_rgba32_pre would be wrong, so switch back to pixfmt_rgba32
|
2012-09-12 12:34:35 -07:00 |
|
artemp
|
06bae0a76c
|
+ zhao-saalfield intial impl (TODO: optimize)
|
2012-09-12 15:20:33 +01:00 |
|
artemp
|
8cb2ce41ac
|
raster scaling issue
+ fix rasterizer polygon to be equal to target image
+ align raster to pixel bouyndaries (?)
( fixes grey border issue - #1471)
|
2012-09-12 14:41:27 +01:00 |
|
Dane Springmeyer
|
231bf3c197
|
add source tif for #1471 testcase
|
2012-09-11 19:30:19 -07:00 |
|
Dane Springmeyer
|
12f26614e5
|
add failing testcase for #1471 (expected image generated with patch from #1471 that disables premultiplication of data raster before blending)
|
2012-09-11 19:29:45 -07:00 |
|
Dane Springmeyer
|
116f025e8a
|
fix expected reprojection output after #1473
|
2012-09-11 17:04:15 -07:00 |
|
Dane Springmeyer
|
4703e7bda4
|
fix query tests after #1473
|
2012-09-11 17:01:47 -07:00 |
|
artemp
|
f5b4ff9429
|
Merge branch 'master' into conv_simplify
|
2012-09-10 10:26:14 +01:00 |
|
Hermann Kraus
|
99265b22ac
|
Add simple render script.
|
2012-09-10 02:42:59 +02:00 |
|
Hermann Kraus
|
297bfeb454
|
Merge branch 'master' into harfbuzz
Conflicts:
src/symbolizer_helpers.cpp
|
2012-09-08 01:26:47 +02:00 |
|
Hermann Kraus
|
0744362481
|
Fix tests broken by a513d3f97d .
|
2012-09-08 00:43:32 +02:00 |
|
Hermann Kraus
|
c862d3f672
|
Solve naming conflict.
|
2012-09-08 00:29:49 +02:00 |
|
Dane Springmeyer
|
0de2beac3e
|
improve interplay of maximum-extent and map.zoom_all, now properly clipping to maximum-extent - closes #1473
|
2012-09-07 10:36:14 -07:00 |
|
Hermann Kraus
|
85e075b8ea
|
Merge branch 'master' into harfbuzz
Conflicts:
bindings/python/mapnik_text_placement.cpp
include/mapnik/font_engine_freetype.hpp
include/mapnik/map.hpp
include/mapnik/metawriter.hpp
include/mapnik/metawriter_inmem.hpp
include/mapnik/metawriter_json.hpp
include/mapnik/placement_finder.hpp
include/mapnik/symbolizer.hpp
include/mapnik/symbolizer_helpers.hpp
include/mapnik/text_properties.hpp
src/agg/process_shield_symbolizer.cpp
src/build.py
src/cairo_renderer.cpp
src/feature_style_processor.cpp
src/grid/process_shield_symbolizer.cpp
src/metawriter.cpp
src/metawriter_inmem.cpp
src/placement_finder.cpp
src/processed_text.cpp
src/symbolizer_helpers.cpp
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/styles/formatting.xml
tests/visual_tests/test.py
|
2012-09-07 19:07:31 +02:00 |
|
artemp
|
29423cfc1c
|
Merge branch 'master' into conv_simplify
Conflicts:
bindings/python/mapnik_markers_symbolizer.cpp
plugins/input/ogr/ogr_index_featureset.cpp
plugins/input/shape/dbfile.cpp
plugins/input/shape/shapefile.hpp
src/load_map.cpp
|
2012-09-07 16:46:02 +01:00 |
|
artemp
|
967d6110bf
|
+ singleton: return ref from instance() method
|
2012-09-07 16:23:03 +01:00 |
|
artemp
|
11e6ba0c09
|
+ make client methods non-static in classes derived from
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
|
2012-09-07 14:56:30 +01:00 |
|
artemp
|
8fa0742a53
|
+ make client methods non-static in classes derived from
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
|
2012-09-07 14:51:25 +01:00 |
|
artemp
|
5f8bb423e8
|
Merge branch 'conv_simplify' of git://github.com/kkaefer/mapnik into kkaefer-conv_simplify
|
2012-09-06 13:12:39 +01:00 |
|
artemp
|
a513d3f97d
|
+ code: avoid exposing unsafe static methods in datasource_cache ( #1451)
+ python: remove redundent 'instance' method (mapnik.DatasourceCache)
+ python: reflect plugin_directories method
+ tests: update python usage
TODO: consider using similar approach in FontEngine etc..
TODO: consider returning reference from singleton::instance() to
safeguard from accidental deleting a 'singleton' pointer
|
2012-09-05 12:53:37 +01:00 |
|
artemp
|
69fb17cd3c
|
+ port 170e23440f to master
|
2012-09-05 10:58:21 +01:00 |
|
Hermann Kraus
|
786f798cab
|
Use double instead of unsigned while parsing XML.
Closes #1469.
|
2012-09-05 02:15:58 +02:00 |
|
Dane Springmeyer
|
59129a7a2b
|
rename variable to avoid confusion with text_size
|
2012-09-04 14:35:03 -07:00 |
|
Dane Springmeyer
|
0e0cd08ccb
|
ensure opacity naming fix works - closes #1470
|
2012-09-04 13:30:24 -07:00 |
|
Dane Springmeyer
|
d133db55f6
|
remove unused style
|
2012-09-04 13:21:40 -07:00 |
|
Dane Springmeyer
|
b385370126
|
fix spelling of opacity in text/formatting - refs #1470
|
2012-09-04 13:17:09 -07:00 |
|