Artem Pavlenko 9840c7df4c Merge branch 'master' into compositing ...

Conflicts:
	include/mapnik/util/dasharray_parser.hpp
	src/agg/process_line_symbolizer.cpp
	src/image_compositing.cpp

2012-03-26 09:05:02 +01:00

..

mapnik

make available MAPNIK_VERSION_STRING in c++ header (not just in python) and add MAPNIK_VERSION_IS_RELEASE define that indicates if the code is released

2012-03-14 18:30:32 -07:00

mapnik2

switch back from mapnik2 to mapnik

2011-11-23 11:33:58 +00:00

build.py

+ geojson generator interface

2012-02-20 10:53:58 +00:00

mapnik_color.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_coord.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_datasource_cache.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_datasource.cpp

merge master with feature_impl

2012-01-17 17:47:27 -05:00

mapnik_enumeration.hpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_envelope.cpp

whitespace fixes (using format_source_files.sh)

2012-02-01 17:30:26 -08:00

mapnik_expression.cpp

Rename filter_factory to expression.

2012-02-12 13:06:39 +01:00

mapnik_feature.cpp

+ add to_geojson() method to mapnik.Path

2012-02-20 12:05:11 +00:00

mapnik_featureset.cpp

switch back from mapnik2 to mapnik

2011-11-23 11:33:58 +00:00

mapnik_font_engine.cpp

declare register_fonts as static

2012-03-23 14:22:47 -07:00

mapnik_fontset.cpp

whitespace fixes (using format_source_files.sh)

2012-02-01 17:30:26 -08:00

mapnik_gamma_method.cpp

whitespace fixes (using format_source_files.sh)

2012-02-01 17:30:26 -08:00

mapnik_geometry.cpp

+ add to_geojson() method to mapnik.Path

2012-02-20 12:05:11 +00:00

mapnik_grid_view.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_grid.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_image_view.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_image.cpp

apply mapnik_format.el formatting

2012-03-13 07:59:22 -07:00

mapnik_inmem_metawriter.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_label_collision_detector.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_layer.cpp

remove camel-case names from layer.[h,c]pp

2012-03-12 15:39:59 +00:00

mapnik_line_pattern_symbolizer.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_line_symbolizer.cpp

+ add optional smothing to line_symbolizer

2012-03-15 10:26:53 +00:00

mapnik_map.cpp

remove the storage and serialization of 'font-directory' and 'minimum-version' since there is no strong need to have them accessible after initial parsing

2012-03-23 18:14:14 -07:00

mapnik_markers_symbolizer.cpp

fix marker width/height to mean pixels - which it should have all along - closes #1134

2012-03-23 20:28:12 -07:00

mapnik_palette.cpp

whitespace fixes (using format_source_files.sh)

2012-02-01 17:30:26 -08:00

mapnik_parameters.cpp

avoid compiler warning

2012-02-13 11:30:27 -08:00

mapnik_point_symbolizer.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_polygon_pattern_symbolizer.cpp

whitespace fixes (using format_source_files.sh)

2012-02-01 17:30:26 -08:00

mapnik_polygon_symbolizer.cpp

+ add smooth property

2012-03-14 16:51:07 +00:00

mapnik_proj_transform.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_projection.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_python.cpp

make available MAPNIK_VERSION_STRING in c++ header (not just in python) and add MAPNIK_VERSION_IS_RELEASE define that indicates if the code is released

2012-03-14 18:30:32 -07:00

mapnik_query.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_raster_colorizer.cpp

switch back from mapnik2 to mapnik

2011-11-23 11:33:58 +00:00

mapnik_raster_symbolizer.cpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_rule.cpp

Rename filter_factory to expression.

2012-02-12 13:06:39 +01:00

mapnik_shield_symbolizer.cpp

Update tests.

2012-02-21 10:21:40 +01:00

mapnik_stroke.cpp

whitespace fixes (using format_source_files.sh)

2012-02-01 17:30:26 -08:00

mapnik_style.cpp

switch back from mapnik2 to mapnik

2011-11-23 11:33:58 +00:00

mapnik_svg.hpp

code formatting

2011-11-13 19:54:32 -08:00

mapnik_symbolizer.cpp

+ experimental compositing symbolizer (fill only)

2012-03-21 15:47:33 +00:00

mapnik_text_placement.cpp

Implement justify-alignment=auto.

2012-03-19 17:12:53 +01:00

mapnik_threads.hpp

apply mapnik_format.el formatting

2012-03-13 07:59:22 -07:00

mapnik_value_converter.hpp

python: use value_convertor to handle mapnik::parameter value_holder variant

2011-12-02 13:37:26 -08:00

mapnik_view_transform.cpp

code formatting

2011-11-13 19:54:32 -08:00

python_cairo.cpp

avoid deprecated string conversion warning in pycairo by overriding Pycairo_Import macro and casting away const to please the c/c++ borderlands

2011-04-04 04:40:18 +00:00

python_grid_utils.hpp

convert to using feature_ptr rather than const& for renderers

2012-02-01 16:37:05 -08:00

python_optional.hpp

apply mapnik_format.el formatting

2012-03-13 07:59:22 -07:00