Dane Springmeyer 6433d9482e Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 ...

Conflicts:
	include/mapnik/symbolizer.hpp
	src/agg/agg_renderer.cpp
	src/agg/process_line_pattern_symbolizer.cpp
	src/agg/process_line_symbolizer.cpp
	src/agg/process_polygon_pattern_symbolizer.cpp
	src/agg/process_polygon_symbolizer.cpp
	src/cairo_renderer.cpp
	src/feature_type_style.cpp
	src/grid/process_line_pattern_symbolizer.cpp
	src/grid/process_line_symbolizer.cpp
	src/grid/process_markers_symbolizer.cpp
	src/grid/process_polygon_pattern_symbolizer.cpp
	src/grid/process_polygon_symbolizer.cpp

2014-03-10 00:05:56 -07:00

..

mapnik

Merge branch 'master' into expr-v2

2014-01-17 19:59:05 -08:00

mapnik2

switch back from mapnik2 to mapnik

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

boost_std_shared_shim.hpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

build.py

fix linux linking order in python bindings

2014-01-20 11:15:10 -08:00

mapnik_color.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_coord.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_datasource_cache.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_datasource.cpp

Merge branch '2.3.x' of github.com:mapnik/mapnik

2013-11-07 09:21:05 -08:00

mapnik_enumeration_wrapper_converter.hpp

enumeration_wrapper to python converter (work-in-progress)

2013-12-05 16:31:30 +00:00

mapnik_enumeration.hpp

minimum boost version is 1.47 - remove obsolete code handling older versions

2014-01-27 13:19:21 -08:00

mapnik_envelope.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_expression.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_feature.cpp

symbolizer-expressions replayed against latest master

2013-11-27 22:50:15 -08:00

mapnik_featureset.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_font_engine.cpp

iwyu

2013-11-07 20:24:10 -08:00

mapnik_fontset.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_gamma_method.cpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

mapnik_geometry.cpp

minimum boost version is 1.47 - remove obsolete code handling older versions

2014-01-27 13:19:21 -08:00

mapnik_grid_view.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_grid.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_image_view.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_image.cpp

merge with 2.3.x

2013-10-28 14:45:52 -07:00

mapnik_label_collision_detector.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_layer.cpp

Merge branch '2.3.x' of github.com:mapnik/mapnik

2013-11-07 09:21:05 -08:00

mapnik_logger.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_map.cpp

Merge branch '2.3.x' of github.com:mapnik/mapnik

2013-11-13 20:00:13 -08:00

mapnik_palette.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_parameters.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_proj_transform.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_projection.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_python.cpp

enumeration_wrapper to python converter (work-in-progress)

2013-12-05 16:31:30 +00:00

mapnik_query.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_raster_colorizer.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

mapnik_rule.cpp

python : revive mapnik.Symbolizers (required by mapnik.Rule.symbols)

2013-12-05 10:18:25 +00:00

mapnik_scaling_method.cpp

python bindings: reduce compile times by consolidating code in fewer cpp files

2013-11-05 15:11:23 -08:00

mapnik_style.cpp

make inflated image for blurring opt-in via 'image-filters-inflate' option - refs #2165

2014-02-27 11:17:09 -08:00

mapnik_svg.hpp

bindings: get_filename - no need for const here

2012-09-03 10:52:26 -07:00

mapnik_symbolizer.cpp

move symbolizer to json into core

2013-12-10 15:51:07 -05:00

mapnik_text_placement.cpp

remove unused text_symbolizer.hpp/cpp

2014-02-25 14:25:23 +00:00

mapnik_threads.hpp

python bindings: reduce compile times by consolidating code in fewer cpp files

2013-11-05 15:11:23 -08:00

mapnik_value_converter.hpp

use mapnik::value_xxx types

2013-12-06 14:36:45 +00:00

mapnik_view_transform.cpp

implement new debug system

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

mapnik_wkt_reader.cpp

attempt to fix boost python with c++11 and boost 1.49 - refs #2022

2013-10-23 15:42:01 -07:00

python_grid_utils.cpp

Merge branch '2.3.x' of github.com:mapnik/mapnik

2013-11-07 09:21:05 -08:00

python_grid_utils.hpp

+ don't pass std::string arg by value - use const&

2012-08-16 12:05:31 +01:00

python_optional.hpp

python bindings: reduce compile times by consolidating code in fewer cpp files

2013-11-05 15:11:23 -08:00