Commit graph

3497 commits

Author SHA1 Message Date
artemp
a80c85bff8 split svg_path_grammar,svg_points_grammar,svg_transform_grammar into *.hpp, *_impl.hpp + move boost::phoenix::function initialisation into ctor's
(ref #3343)
2016-03-08 14:58:23 +01:00
artemp
196b24c972 make svg_transform_grammar stateless ref #3343
(https://github.com/mapnik/mapnik/pull/2231)
2016-03-08 14:58:23 +01:00
artemp
7b452c18e0 make svg_path_grammar and svg_points_grammar stateless ref #3343
(https://github.com/mapnik/mapnik/pull/2231)
2016-03-08 14:58:23 +01:00
Dane Springmeyer
d2df889b47 disable dlclose when building with --coverage - refs #3344 2016-03-08 14:57:23 +01:00
Dane Springmeyer
29e78e15ec add COVERAGE configure option - only set coverage flags on libmapnik and plugins - refs #3344 2016-03-08 14:57:23 +01:00
Dane Springmeyer
baf12bbeac make code comment about needing immutable grammars - refs #3342 [skip ci] 2016-03-08 14:57:22 +01:00
artemp
65e81848ba Merge branch 'master' into spirit-x3 2016-03-03 12:04:55 +01:00
Mickey Rose
489631ca34 remove reference on template parameter Detector 2016-03-03 00:17:41 +01:00
Mickey Rose
c8e3a0d549 refactor render_markers_symbolizer_visitor
- extract some common code into functions
- for cleaner dif: git show -w --patience
2016-03-03 00:07:18 +01:00
Dane Springmeyer
296f8d467d avoid grammar_impl usage in headers - other minor refactoring around json spirit 2016-03-02 12:48:07 -08:00
Dane Springmeyer
d148a966c8 from_geojson/to_geojson are now used in unit tests, csv plugin, and node-mapnik so move these to cpp 2016-03-02 11:26:56 -08:00
artemp
f11cc5920f revive lost to_utf8 method but move it into '<mapnik/unicode.hpp>' 2016-03-02 16:47:55 +01:00
artemp
65da617ec0 re-use vector_converter + move apply_marker_multi into *.cpp 2016-03-02 16:20:10 +01:00
Mickey Rose
66e7ef58d7 refactor markers_placement_finder
- refs #3327

Replace member variant of placement-type implementations with plain
union. The active implementation is chosen at construction time like
before.

Make placement-type implementation classes virtual to allow invoking
the active union member through a base class pointer.
2016-03-02 00:53:45 +01:00
artemp
77eaaa1259 move vertex_adapters implementation into .cpp - mark extern 2016-03-01 21:55:47 +01:00
artemp
d0fd99f75c remove redundant #include 2016-03-01 14:11:54 +01:00
artemp
bd5d1c8df8 prune include directives a bit more 2016-02-24 12:24:06 +01:00
artemp
e6ad70468f prune include directives a bit more 2016-02-24 12:23:03 +01:00
artemp
8d1bacf8a6 Merge branch 'value-cpp' into spirit-x3 2016-02-24 11:48:22 +01:00
artemp
50db396760 move value implementation into *.cpp 2016-02-23 23:05:19 +01:00
artemp
d43bc3232f remove unused include 2016-02-22 15:38:15 +01:00
artemp
bf0ad26944 remove unused include 2016-02-22 15:37:41 +01:00
artemp
65d377e085 Merge branch 'master' into spirit-x3 2016-02-22 14:40:18 +01:00
artemp
2c931a238f color.cpp - port premultiply/demultiply and remove agg dependency 2016-02-22 14:39:31 +01:00
artemp
3e8ee9a559 simplify color generators - remove boost::phoenix usage
(ref: https://github.com/mapbox/windows-builds/issues/81)
2016-02-22 12:45:28 +01:00
Mickey Rose
ea54876d79 remove unused includes 2016-02-20 01:16:11 +01:00
artemp
c0c4a7bf6b Merge branch 'master' into spirit-x3 2016-02-19 11:30:22 +01:00
artemp
96175554ae Add explicit instantiation declaration of singleton<mapped_memory_cache, CreateStatic> to avoid multiple instantiations across translation units. (ref #3306) 2016-02-19 11:00:58 +01:00
artemp
c5fc27920e Merge branch 'master' into spirit-x3 2016-02-18 17:40:50 +01:00
artemp
085a2afe40 minor formatting 2016-02-18 17:17:44 +01:00
artemp
a4c4c5e542 Merge branch 'master' into spirit-x3 2016-02-17 12:11:53 +01:00
Mickey Rose
1499475d04 remove to_utf8, instead use UnicodeString::toUTF8String 2016-02-15 21:07:01 +01:00
artemp
c60f9d1b63 Revert "json - split/refactor geojson grammars more" as it's not helping with improving compilation times, rather opposite.
This reverts commit 8102827215.
2016-02-12 10:37:22 +01:00
artemp
c07f23dc7c Revert "add missing *.cpp"
This reverts commit cca2a33acd.
2016-02-12 10:20:24 +01:00
artemp
f2c4ec86ea Merge branch 'master' into spirit-x3 2016-02-11 10:19:01 +01:00
Dane Springmeyer
10bd37ddd7 avoid unneccesary dependence on << operator of mapnik::enumeration 2016-02-09 10:09:12 -08:00
Dane Springmeyer
6c1b6e301d gradient does not need to be a fancy enumeration 2016-02-09 09:56:57 -08:00
artemp
cca2a33acd add missing *.cpp 2016-02-09 13:22:56 +01:00
artemp
8102827215 json - split/refactor geojson grammars more 2016-02-09 13:21:20 +01:00
artemp
2a3248cfaa image_filters_grammar_x3 - initial port to x3 + remove unused grammars (css_color_grammar,image_filter_grammar) 2016-02-08 12:49:13 +01:00
artemp
d416f9fb7b Merge branch 'master' into spirit-x3 2016-02-03 17:24:11 +01:00
Dane Springmeyer
834028db7a remove miniz support - library is unused in mapnik and unmaintained since 2013 (https://code.google.com/archive/p/miniz/) 2016-02-02 11:37:26 -08:00
artemp
093009137e css_color - re-factor grammar into *_x3.hpp, *_x3_def.hpp, *_x3.cpp. Make css_color_grammar_type available via css_color_grammar::css_color_grammar_type color_grammar(); 2016-02-01 15:34:18 +01:00
artemp
4b5a73e21b Merge branch 'master' into spirit-x3 2016-02-01 10:04:07 +01:00
Mickey Rose
4ef8efd554 remove struct member designators from initialization - fixes #3277
- it's C99 syntax, illegal in C++11 braced-init-list
- interestingly it's accepted in C++ by GCC and Clang,
  rejected by MSVC
2016-01-30 20:44:40 +01:00
artemp
3e866e63b2 Merge branch 'master' into spirit-x3 2016-01-29 11:15:19 +01:00
Mickey Rose
1eb298f48c fix text_render_thunk construction
- this reverts render_thunk_extractor visitation by text/shield
  symbolizer back to how it works in master, only amended to avoid
  passing temporaries to text_symbolizer_helper
2016-01-29 00:12:18 +01:00
Mickey Rose
7bbc758fbc cleanup extraneous includes 2016-01-29 00:12:18 +01:00
Mickey Rose
6d84094f77 move render_markers_symbolizer to separate .cpp 2016-01-29 00:12:18 +01:00
Mickey Rose
f99c0e5a6f refactor render_markers_symbolizer 2016-01-29 00:10:19 +01:00