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

..

agg

Merge branch 'textplacement-merge' into feature-text-merge

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

grid

ShieldSymbolizer for Grid renderer.

2012-01-29 04:57:56 +01:00

svg

merge textplacement-merge into feature_impl

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

wkt

maintain boost 1.42 compatibility by disabling new wkt parser for boost <= 1.46

2011-09-09 09:26:11 +00:00

arrow.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

box2d.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

build.py

Merge branch 'textplacement-merge' into feature-text-merge

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

building_symbolizer.cpp

move building_symbolizer into separate hpp/cpp

2012-01-19 18:26:15 -05:00

cairo_renderer.cpp

Merge branch 'textplacement-merge' into feature-text-merge

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

color.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

datasource_cache.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

deepcopy.cpp

add poor man's deepcopy method :

2011-12-20 16:26:30 +00:00

distance.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

expression_string.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

feature_kv_iterator.cpp

+ move feature_kv_iterotor into *.cpp to avoid cyclic deps

2012-01-18 09:15:52 -05:00

feature_style_processor.cpp

feature impl update

2012-01-12 09:33:43 +00:00

feature_type_style.cpp

fix typo

2011-12-07 23:03:14 +01:00

filter_factory.cpp

removing as it doesn't belong in here.

2012-01-27 13:23:15 +00:00

font_engine_freetype.cpp

merge textplacement-merge into feature_impl

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

font_set.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

gamma_method.cpp

+ add missing *.cpp file

2012-01-19 12:54:56 -05:00

gradient.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

graphics.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

image_reader.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

image_util.cpp

- palette not supported in tiff images (yet)

2011-11-28 17:18:30 +01:00

jpeg_reader.cpp

c++ style include

2011-11-08 10:34:00 -08:00

layer.cpp

remove title,abstract members from layer class

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

libxml2_loader.cpp

merge textplacement-merge into feature_impl

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

line_pattern_symbolizer.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

line_symbolizer.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

load_map.cpp

Update symbolizer helpers for ShieldSymbolizer.

2012-01-29 04:49:02 +01:00

map.cpp

python: reflect fontsets to enable fuller test of map.deepcopy - closes #348

2011-12-20 12:34:27 -08:00

mapped_memory_cache.cpp

use mutex from base class

2011-11-18 09:39:57 +00:00

marker_cache.cpp

use mutex from base class

2011-11-18 09:39:57 +00:00

markers_symbolizer.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

memory_datasource.cpp

merge master with feature_impl

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

memory.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

metawriter_factory.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

metawriter_inmem.cpp

merge textplacement-merge into feature_impl

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

metawriter.cpp

Merge branch 'textplacement-merge' into feature-text-merge

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

palette.cpp

- modified some ugly error-prone and worse piece of c++ i've ever seen in my life

2011-10-23 21:37:56 +02:00

parse_path.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

placement_finder.cpp

Handle additional boxes from ShieldSymbolizer.

2012-01-29 20:28:32 +01:00

plugin.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

png_reader.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

point_symbolizer.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

polygon_pattern_symbolizer.cpp

+ use mapnik::gamma_method_e for all symbolizers

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

polygon_symbolizer.cpp

move building_symbolizer into separate hpp/cpp

2012-01-19 18:26:15 -05:00

proj_transform.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

projection.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

raster_colorizer.cpp

update to work with new feature_impl

2012-01-17 14:19:38 -05:00

save_map.cpp

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

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

scale_denominator.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

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

stroke.cpp

+ use mapnik::gamma_method_e for all symbolizers

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

svg_parser.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

svg_path_parser.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

svg_points_parser.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

svg_transform_parser.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

symbolizer_helpers.cpp

Handle additional boxes from ShieldSymbolizer.

2012-01-29 20:28:32 +01:00

symbolizer.cpp

merge textplacement-merge into feature_impl

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

text_placements.cpp

Remove text_placement_info::initialize() to avoid incorrect usage of this object.

2012-01-29 20:04:31 +01:00

text_processing.cpp

Rename set_values_from_xml to from_xml.

2012-01-28 17:13:41 +01:00

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

tiff_reader.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

unicode.cpp

- fix copyright to 2011 (script to do this will follow)

2011-10-23 15:04:25 +02:00

warp.cpp

forgot to add warp.cpp as a source

2011-09-16 14:57:40 +00:00

wkb.cpp

Simplify geometry model to support: Point/LineString/Polygon

2011-12-06 12:53:16 +00:00