Artem Pavlenko b90de4874c Merge branch 'textplacement-merge' into feature-text-merge ...

Conflicts:
	docs/textrendering.gv
	include/mapnik/building_symbolizer.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_placements.hpp
	include/mapnik/text_placements_list.hpp
	include/mapnik/text_placements_simple.hpp
	include/mapnik/text_processing.hpp
	plugins/input/shape/shape_utils.hpp
	src/agg/process_shield_symbolizer.cpp
	src/agg/process_text_symbolizer.cpp
	src/cairo_renderer.cpp
	src/grid/process_shield_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/load_map.cpp
	src/placement_finder.cpp
	src/shield_symbolizer.cpp
	src/text_placements.cpp
	src/text_processing.cpp
	src/text_symbolizer.cpp
	tests/visual_tests/clean.sh
	tests/visual_tests/test.py

Merge herm/textplacement-merge

2012-01-31 11:09:55 +00:00

..

mapnik

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

mapnik2

switch back from mapnik2 to mapnik

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

build.py

scons: python 2.5 compatibility

2011-12-16 10:57:05 -08: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

add __deepcopy__ method using native c++ copy semantics

2011-12-20 16:17:20 +00:00

mapnik_expression.cpp

code formatting

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

mapnik_feature.cpp

add push_new member function which allows modifying

2012-01-30 14:05:41 +00:00

mapnik_featureset.cpp

switch back from mapnik2 to mapnik

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

mapnik_font_engine.cpp

code formatting

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

mapnik_fontset.cpp

add fontset binding

2011-12-22 12:48:41 -08:00

mapnik_gamma_method.cpp

more files...

2012-01-19 12:57:34 -05:00

mapnik_geometry.cpp

fix compile with older boost

2012-01-06 16:22:39 -08: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

code formatting

2011-11-13 19:54:32 -08: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 title,abstract members from layer class

2011-12-13 16:34:10 +00:00

mapnik_line_pattern_symbolizer.cpp

code formatting

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

mapnik_line_symbolizer.cpp

code formatting

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

mapnik_map.cpp

finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around

2012-01-17 01:09:46 -05:00

mapnik_markers_symbolizer.cpp

code formatting

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

mapnik_palette.cpp

avoid wrapping boost::shared_ptr directly

2012-01-13 12:08:09 +00:00

mapnik_parameters.cpp

use declared iterator

2012-01-09 08:38:46 -08:00

mapnik_point_symbolizer.cpp

code formatting

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

mapnik_polygon_pattern_symbolizer.cpp

+ use mapnik::gamma_method_e for all symbolizers

2012-01-19 12:45:24 -05:00

mapnik_polygon_symbolizer.cpp

+ use mapnik::gamma_method_e for all symbolizers

2012-01-19 12:45:24 -05: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

Python bindings for text_symbolizer_properties.

2012-01-30 03:32:25 +01: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

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

mapnik_shield_symbolizer.cpp

Make code easier to read by using std::pair instead of boost::tuple for position.

2012-01-29 17:33:43 +01:00

mapnik_stroke.cpp

+ use mapnik::gamma_method_e for all symbolizers

2012-01-19 12:45:24 -05: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

merge textplacement-merge into feature_impl

2012-01-26 13:04:08 +00:00

mapnik_text_placement.cpp

Python bindings for text_symbolizer_properties.

2012-01-30 03:32:25 +01:00

mapnik_text_symbolizer.cpp

Make code easier to read by using std::pair instead of boost::tuple for position.

2012-01-29 17:33:43 +01: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

code formatting

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

python_optional.hpp

code formatting

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