mapnik/python at 4f4e2b001ed15125393a70d7816d1816ee19e698 - mapnik - Gitea: Git with a cup of tea

archive-gh-me/mapnik

mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00

History

artemp 4f4e2b001e Merge branch 'master' into c++11

Conflicts:
	SConstruct
	benchmark/run.cpp
	bindings/python/mapnik_datasource.cpp
	bindings/python/mapnik_feature.cpp
	bindings/python/python_optional.hpp
	include/mapnik/css_color_grammar.hpp
	include/mapnik/expression_grammar.hpp
	include/mapnik/feature.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/image_filter_types.hpp
	include/mapnik/image_util.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_grammar.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/tiff_io.hpp
	include/mapnik/util/geometry_svg_generator.hpp
	include/mapnik/util/geometry_wkt_generator.hpp
	include/mapnik/utils.hpp
	include/mapnik/webp_io.hpp
	include/mapnik/wkt/wkt_grammar.hpp
	plugins/input/shape/shape_datasource.cpp
	plugins/input/shape/shapefile.hpp
	src/expression_grammar.cpp
	src/expression_string.cpp
	src/image_util.cpp
	src/json/feature_collection_parser.cpp
	src/json/feature_parser.cpp
	src/miniz.c
	src/symbolizer_helpers.cpp
	src/tiff_reader.cpp
	src/webp_reader.cpp
	tests/cpp_tests/geometry_converters_test.cpp
	tests/cpp_tests/image_io_test.cpp
	tests/cpp_tests/map_request_test.cpp
	tests/python_tests/image_test.py
	tests/visual_tests/test.py

2013-08-30 09:46:09 +01:00

..

add python wrappers for CSV and GeoJSON plugins - closes #1882

2013-06-02 12:12:39 -07:00

switch back from mapnik2 to mapnik

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

build.py

ensure libmapnik DEFINES are propagated to the python bindings

2013-07-23 19:58:13 -04:00

mapnik_building_symbolizer.cpp

refactor headers involving variant attempting to move as much variant usage out of hpp files to speed up compiles

2013-01-12 21:00:45 -08: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

Merge branch 'master' into bigint

2012-12-18 13:57:39 +00:00

mapnik_datasource.cpp

Merge branch 'master' into c++11

2013-08-30 09:46:09 +01:00

mapnik_debug_symbolizer.cpp

reflect debug symbolizer in python

2013-05-22 06:49:38 -07:00

mapnik_enumeration.hpp

code formatting

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

mapnik_envelope.cpp

add pad method on box2d to help tighten otherwise verbose code

2012-12-11 13:56:25 -08:00

mapnik_expression.cpp

finish to rename of mapnik::Feature -> mapnik::feature_impl

2013-05-16 11:55:58 -07:00

mapnik_feature.cpp

use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string

2013-08-13 18:52:04 -04:00

mapnik_featureset.cpp

finish to rename of mapnik::Feature -> mapnik::feature_impl

2013-05-16 11:55:58 -07:00

mapnik_font_engine.cpp

iwyu

2012-12-16 12:50:36 -08:00

mapnik_fontset.cpp

refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance)

2012-09-14 14:17:45 -07:00

mapnik_gamma_method.cpp

remove old $ cruft

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

mapnik_geometry.cpp

Merge branch 'master' into c++11

2013-08-30 09:46:09 +01:00

mapnik_grid_view.cpp

make it possible to disable compilation of grid_renderer - closes #1962

2013-07-23 19:37:25 -04:00

mapnik_grid.cpp

make it possible to disable compilation of grid_renderer - closes #1962

2013-07-23 19:37:25 -04:00

mapnik_image_view.cpp

im/view.is_solid method in python bindings to match node-mapnik - closes #1728

2013-02-22 13:40:05 -08:00

mapnik_image.cpp

Merge branch 'master' into c++11

2013-08-30 09:46:09 +01:00

mapnik_label_collision_detector.cpp

iwyu

2012-12-16 12:50:36 -08:00

mapnik_layer.cpp

fix compile with python >=3

2013-03-12 18:42:42 -07:00

mapnik_line_pattern_symbolizer.cpp

add LinePatternSymbolizer offset python binding

2013-08-22 12:56:04 +02:00

mapnik_line_symbolizer.cpp

+ symbolizers: add hash impl

2013-02-05 16:53:20 +00:00

mapnik_logger.cpp

iwyu

2012-12-16 12:50:36 -08:00

mapnik_map.cpp

git rid of a few fixme

2013-07-23 16:00:16 -04:00

mapnik_markers_symbolizer.cpp

+ remove redundant work-around

2013-05-16 20:32:19 +01:00

mapnik_palette.cpp

iwyu

2013-06-02 20:19:33 -07:00

mapnik_parameters.cpp

use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string

2013-08-13 18:52:04 -04:00

mapnik_point_symbolizer.cpp

bindings: get_filename - no need for const here

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

mapnik_polygon_pattern_symbolizer.cpp

bindings: get_filename - no need for const here

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

mapnik_polygon_symbolizer.cpp

+ symbolizers: add hash impl

2013-02-05 16:53:20 +00:00

mapnik_proj_transform.cpp

iwyu

2013-06-02 20:19:33 -07:00

mapnik_projection.cpp

remove uneeded default args to projection ctor (also fixes msvc linking)

2013-02-20 10:47:55 -08:00

mapnik_python.cpp

Merge branch 'master' into c++11

2013-08-30 09:46:09 +01:00

mapnik_query.cpp

c++11

2013-04-24 16:40:35 +01:00

mapnik_raster_colorizer.cpp

implement new debug system

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

mapnik_raster_symbolizer.cpp

cherry picking..

2013-05-20 14:00:02 +01:00

mapnik_rule.cpp

finish to rename of mapnik::Feature -> mapnik::feature_impl

2013-05-16 11:55:58 -07:00

mapnik_scaling_method.cpp

remove old $ cruft

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

mapnik_shield_symbolizer.cpp

create path_expression.hpp and leverage to simplify and speed up compiles

2013-01-03 20:00:23 -08:00

mapnik_stroke.cpp

python: add properties to mapnik.Stroke to match xml/svg spec - refs #1427

2012-08-21 15:59:31 -07:00

mapnik_style.cpp

use std::move

2013-05-02 12:03:16 -07:00

mapnik_svg.hpp

bindings: get_filename - no need for const here

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

mapnik_symbolizer.cpp

+ symbolizers: add hash impl

2013-02-05 16:53:20 +00:00

mapnik_text_placement.cpp

workaround c++11 compile error due to ambiguous std::vector::insert usage - closes #1973

2013-07-30 15:14:47 -04:00

mapnik_threads.hpp

apply mapnik_format.el formatting

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

mapnik_value_converter.hpp

Avoid truncating 64 bit return values on 32 bit platforms

2013-07-10 22:36:11 +01:00

mapnik_view_transform.cpp

implement new debug system

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

mapnik_wkt_reader.cpp

+ add missing .cpp file

2013-04-23 18:18:03 +01:00

python_cairo.cpp

fix compile with python 3.3.x - closes #1595

2013-01-10 23:04:14 -08:00

python_grid_utils.cpp

Merge branch 'master' into c++11

2013-08-30 09:46:09 +01: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

Merge branch 'master' into c++11

2013-08-30 09:46:09 +01:00