artemp
fe215a684e
c++11 style : replace (almost) all typedef with type alias's
2014-07-07 18:23:15 +01:00
artemp
bedd275e95
more const correctness + cleaups
2014-06-02 17:09:12 +01:00
Dane Springmeyer
2f8451b99a
variables support for cairo/grid/svg
2014-05-13 18:24:17 -07:00
Dane Springmeyer
9e9747ffad
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
src/agg/process_building_symbolizer.cpp
src/cairo_context.cpp
src/cairo_renderer.cpp
src/grid/process_building_symbolizer.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.png
tests/python_tests/images/support/marker-text-line-scale-factor-10.png
tests/python_tests/images/support/marker-text-line-scale-factor-100.png
tests/python_tests/images/support/marker-text-line-scale-factor-2.png
tests/python_tests/images/support/marker-text-line-scale-factor-5.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/test.py
2014-04-24 21:44:28 -07:00
Dane Springmeyer
39737c5f1d
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
.travis.yml
CHANGELOG.md
bindings/python/build.py
include/mapnik/feature_style_processor_context.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/json/feature_collection_grammar.hpp
include/mapnik/json/feature_collection_parser.hpp
include/mapnik/json/feature_generator_grammar.hpp
include/mapnik/json/feature_parser.hpp
include/mapnik/json/geojson_generator.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_parser.hpp
plugins/input/gdal/gdal_featureset.cpp
plugins/input/geojson/geojson_datasource.cpp
plugins/input/occi/occi_featureset.cpp
plugins/input/osm/osm_featureset.cpp
plugins/input/postgis/build.py
plugins/input/postgis/connection.hpp
src/agg/agg_renderer.cpp
src/build.py
src/cairo_context.cpp
src/datasource_cache.cpp
src/grid/process_line_symbolizer.cpp
src/grid/process_polygon_pattern_symbolizer.cpp
src/grid/process_polygon_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/json/feature_grammar.cpp
tests/cpp_tests/fontset_runtime_test.cpp
tests/visual_tests/images/collision-600-400-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png
tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png
tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png
tests/visual_tests/test.py
2014-04-24 14:50:55 -07:00
Dane Springmeyer
1e53351467
only compile cpp code if cairo/grid/svg renderers are enabled
2014-04-24 12:54:18 -07:00
Matt Amos
4f871d1fc7
Factored out common fields from grid renderer.
2013-12-05 19:34:32 +00:00
Matt Amos
d64b86dcdf
Updated grid renderer for expr-v2 branch.
...
All the grid visual tests pass.
One small issue is that in the grid line pattern symbolizer it
constructs a 'fake' line symbolizer to re-use code (as the grid
renderer cares nothing for patterns), but doesn't pass the
offset parameter to it. The tests currently require this
behaviour, but they should probably be changed as it seems
incorrect.
2013-12-02 13:49:53 +00:00
artemp
b315eb2167
+ use std::shared_ptr and std::make_shared
2013-09-20 14:01:27 +01:00
Dane Springmeyer
29abb9a7c0
remove unused typedefs - exposed by saucy g++ warnings
2013-08-07 20:59:28 -04:00
Dane Springmeyer
cfc977e6cd
deal with various -Wunused-parameter warnings that are not important
2013-07-23 18:46:54 -04:00
Dane Springmeyer
06803de192
iwyu
2013-03-14 15:13:02 -07:00
Dane Springmeyer
20fcdc8034
iwyu
2013-03-12 16:56:47 -07:00
Dane Springmeyer
c36795e0a9
respect both sx and sy in setting up affine transform for raster scaling since they may be different - closes #1748
2013-03-06 17:41:20 -08:00
Dane Springmeyer
4d82a97814
implement support in cairo and grid renderer for mapnik::request - refs #1737
2013-02-26 15:05:44 -05:00
Dane Springmeyer
18e23be9c0
merge work from mappy/abonnasseau allowing buffer-size to be overiddend by layer - closes #1566
2013-01-15 18:53:34 -08:00
Dane Springmeyer
c860c9165e
various fixes to includes to include what is used
2013-01-03 18:06:07 -08:00
Dane Springmeyer
326b980172
cleanup usage of grid pixel types
2012-12-19 19:19:30 -08:00
Dane Springmeyer
6b84269343
add pad method on box2d to help tighten otherwise verbose code
2012-12-11 13:56:25 -08:00
Alexandre Bonnasseau
efff5f0ef0
Issue #1545 - override buffer-size parameter at layer level - revised
2012-11-08 15:51:22 +01:00
Dane Springmeyer
5120d0398d
add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438
2012-08-27 17:58:49 -07:00
Dane Springmeyer
e62739d146
fix render_marker for grid renderer and other minor syncing - refs #1309
2012-08-02 13:10:05 -07:00
Dane Springmeyer
b4f3d6da11
include what you use
2012-07-24 18:35:41 -07:00
Dane Springmeyer
6d95076954
sync grid renderer with agg for text/shields/point - refs #1309
2012-07-16 11:51:14 -07:00
Dane Springmeyer
3efab11bdb
start carrying through the geometry clipping extent in the grid renderer
2012-07-10 18:39:06 -07:00
Dane Springmeyer
bd7ad7cd3c
address #1198 by moving away from caching grid features and (back) to copying attributes - also roll back to passing feature_impl& rather than feature_ptr (which is now unneeded)
2012-06-15 22:17:26 -04:00
Dane Springmeyer
957c40f763
move to int32 for grid rendering buffer - closes #1196
2012-06-06 16:36:38 -07:00
Artem Pavlenko
500f57cf60
+ make vertex() and rewind() methods const
...
+ remove unused coord_transforms
+ rename coord_transform2 to coord_transform
2012-05-31 12:13:09 +01:00
kunitoki
b60c508c1c
- finish thrashing all the useless ifdef MAPNIK_LOG
2012-04-09 21:41:56 +02:00
kunitoki
1f351e0e09
implement new debug system
2012-04-08 02:20:56 +02:00
Hermann Kraus
2b68cea0a1
Merge branch 'new-xml'
...
Conflicts:
include/mapnik/config_error.hpp
include/mapnik/ptree_helpers.hpp
src/formatting/text.cpp
src/libxml2_loader.cpp
src/load_map.cpp
src/metawriter_factory.cpp
src/text_placements/registry.cpp
src/text_placements/simple.cpp
2012-03-13 11:11:28 +01:00
Artem Pavlenko
254b3c9fa7
Merge branch 'master' into geometry-clipping
...
Conflicts:
SConstruct
include/mapnik/symbolizer_helpers.hpp
src/placement_finder.cpp
2012-03-09 14:18:41 +00:00
Artem Pavlenko
c12161bf19
+ clip geometries before applying any
...
transformations.
2012-03-09 12:44:29 +00:00
Hermann Kraus
cd8cfc6527
Improve error messages.
2012-03-08 18:52:53 +01:00
Dane Springmeyer
f1aee03912
forward declare marker so marker_cache api access is cleaner
2012-03-08 08:37:58 -08:00
Hermann Kraus
ad86e9aebc
Reenable text meta writers.
2012-03-04 23:25:13 +01:00
Hermann Kraus
46f80cc6aa
Use double instead of int and avoid rounding when possible.
...
Closes #1078 .
2012-02-20 19:32:34 +01:00
Hermann Kraus
2843ff3da8
Fix placement_finder.hpp includes.
2012-02-18 14:03:21 +01:00
Dane Springmeyer
17d13cff67
whitespace fixes - closes #911
2012-02-01 17:53:35 -08:00
Dane Springmeyer
07d7d7d537
convert to using feature_ptr rather than const& for renderers
2012-02-01 16:37:05 -08:00
Hermann Kraus
21a58b7b7a
Add missing includes.
2012-01-20 22:43:05 +01:00
Artem Pavlenko
911981aefd
+ various win32 fixes, mainly adding extra namespace qualifiers
...
for vc++10, MAPNIK_DECL ...
2011-10-19 15:29:24 +01:00
Dane Springmeyer
086138dedc
switch back to using grid width/height to allow for variable size grid to be rendered (purely for testing)
2011-06-16 18:08:04 +00:00
Dane Springmeyer
5f53246337
fix bug in width/height of transform in grid_renderer
2011-06-16 16:48:30 +00:00
Dane Springmeyer
3469c20f1c
adapt to new svg renderer template
2011-05-17 06:19:41 +00:00
Dane Springmeyer
adb44a6ec2
account for scaling and alpha of bitmap images in grid_renderer
2011-05-02 22:33:11 +00:00
Dane Springmeyer
5eea164b5a
add grid_renderer backend
2011-04-26 21:44:52 +00:00
