Artem Pavlenko a72ee4ba66 Merge branch 'master' into compositing ...

Conflicts:
	include/mapnik/image_compositing.hpp
	include/mapnik/util/conversions.hpp
	include/mapnik/value.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/png_reader.cpp
	src/svg_parser.cpp
	utils/svg2png/svg2png.cpp

2012-05-01 12:35:49 +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

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_coord.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_datasource_cache.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_datasource.cpp

- improved again the logging facilities

2012-04-09 03:00:51 +02:00

mapnik_enumeration.hpp

code formatting

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

mapnik_envelope.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_expression.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_feature.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_featureset.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_font_engine.cpp

implement new debug system

2012-04-08 02:20:56 +02: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

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_grid_view.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_grid.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_image_view.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_image.cpp

Merge branch 'master' into compositing

2012-05-01 12:35:49 +01:00

mapnik_inmem_metawriter.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_label_collision_detector.cpp

code formatting

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

mapnik_layer.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_line_pattern_symbolizer.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_line_symbolizer.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_logger.cpp

reflect the mapnik.logger types in python

2012-04-13 17:52:13 -07:00

mapnik_map.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_markers_symbolizer.cpp

added MarkersSymbolizer python bindings for fill and stroke

2012-04-11 10:41:15 +01:00

mapnik_palette.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_parameters.cpp

- finish thrashing all the useless ifdef MAPNIK_LOG

2012-04-09 21:41:56 +02:00

mapnik_point_symbolizer.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_polygon_pattern_symbolizer.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_polygon_symbolizer.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_proj_transform.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_projection.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_python.cpp

- improved again the logging facilities

2012-04-09 03:00:51 +02:00

mapnik_query.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_raster_colorizer.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_raster_symbolizer.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_rule.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_shield_symbolizer.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_stroke.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_style.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

mapnik_svg.hpp

code formatting

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

mapnik_symbolizer.cpp

Merge branch 'master' into compositing

2012-05-01 12:35:49 +01: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

implement new debug system

2012-04-08 02:20:56 +02:00

python_cairo.cpp

implement new debug system

2012-04-08 02:20:56 +02:00

python_grid_utils.hpp

- finish thrashing all the useless ifdef MAPNIK_LOG

2012-04-09 21:41:56 +02:00

python_optional.hpp

implement new debug system

2012-04-08 02:20:56 +02:00