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
Mickey Rose
8a55eefbb5
derive virtual_renderer_common from renderer_common
2016-01-29 00:10:19 +01:00
Mickey Rose
844021a892
make face_manager copyable
2016-01-29 00:10:18 +01:00
Mickey Rose
a7ecabcde3
move render_group_symbolizer to separate .cpp
...
- use abstract class render_thunk_list_dispatch for the callback
instead of template parameter render_thunks
- add class scoped_glyph_positions_offset for temporary shifting
of glyph positions
- remove render_offset_placements
2016-01-29 00:10:18 +01:00
Mickey Rose
9d7b3d00e1
minor namespace cleanup in group_layout_manager
2016-01-29 00:10:18 +01:00
Mickey Rose
7761d32ec5
split common group symbolizer stuff
2016-01-29 00:10:18 +01:00
Dane Springmeyer
ed076bf3f5
compile image_filter_grammar separately
2016-01-28 12:04:36 -08:00
artemp
d027ed67c7
more const strictness, update to work with latest mapbox::variant/visitor-no-copy branch
2016-01-27 14:50:17 +01:00
artemp
9831e9eb87
Merge branch 'master' into spirit-x3
2016-01-25 10:29:38 +01:00
Mickey Rose
8d7fca3236
svg_parse_value - add 'px' unit, report trailing garbage
...
- avoid operator comma in semantic action, refs #3249
2016-01-23 20:44:14 +01:00
artemp
57a4040caf
Merge remote-tracking branch 'origin/spirit-x3' into spirit-x3
2016-01-22 16:53:37 +01:00
artemp
049382a961
Merge remote-tracking branch 'origin' into spirit-x3
2016-01-22 16:52:15 +01:00
Dane Springmeyer
e14fa647a1
fix yet more -Wshadow warnings
2016-01-21 14:13:55 -08:00
Blake Thompson
d3d1106865
Fixed bug around set envelope in memorydatasource
2016-01-21 15:20:50 -06:00
artemp
68ab306708
Merge branch 'master' into spirit-x3
2016-01-21 10:51:59 +01:00
artemp
e5db888673
remove redundant t == "png" check as it results in slower code ref #3243
2016-01-20 16:48:26 +01:00
Dane Springmeyer
4432e93250
Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3
2016-01-19 12:25:36 -08:00
artemp
1bfabec6be
parse_svg_value - add DPI template parameter (default 90) (#3233 )
2016-01-15 09:38:46 +00:00
