sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11720 commits 112 branches 95 tags 181 MiB
Commit graph

3989 commits

Author SHA1 Message Date
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
239623f976 remove unused variable [skip ci] 2016-01-30 03:24:07 +01:00
Mickey Rose
a8d8a0d74f make clang happy - const default initialization 
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#253
http://stackoverflow.com/questions/7411515/why-does-c-require-a-user-provided-default-constructor-to-default-construct-a
http://stackoverflow.com/questions/21900237/do-i-really-need-to-implement-user-provided-constructor-for-const-objects
 2016-01-30 02:03:25 +01:00
Mickey Rose
be5d772d6c attempt to fortify mapnik::value conversion construction 
- including correct noexcept specifier
- adding conversion-assignment operator wasn't really necessary,
  but it might be more efficient since it avoids constructing an
  intermediate variant
 2016-01-30 02:03:25 +01:00
Mickey Rose
400e05585f refine noexcept specifiers on forwarding conversion constructors 2016-01-30 02:03:25 +01:00
Mickey Rose
b2c14972de remove explicitly-defaulted constructors and assignment operators ... 
... where they should be implicitly defined by the compiler
 2016-01-30 02:03:25 +01:00
Dane Springmeyer
bc89f7f877 upgrade to latest variant - refs mapbox/variant#73 2016-01-29 15:54:15 -08:00
artemp
64c2ad1e93 Just let the compiler generate move/copy for mapnik::value - via @lightmare ref https://github.com/mapnik/mapnik/issues/3274#issuecomment-176730124 2016-01-29 15:05:08 +01:00
artemp
a50036d421 value - make noexcept conditional + add move assigment operator 2016-01-29 13:07:43 +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
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
lightmare
5663e2daaf Merge pull request #3245 from lightmare/movable 
add util::movable to complement util::noncopyable
 2016-01-28 19:16:26 +01:00
artemp
ea68e202be Merge branch 'master' into visitor-no-copy 2016-01-27 17:10:51 +01: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
4e8bbe48df fix return type 2016-01-27 12:05:39 +01:00
Dane Springmeyer
753a0ad216 give users a hint on what to do when they hit 'Invalid index file' 2016-01-26 12:19:34 -08:00
artemp
e8c029d9da fix css_color_grammar by providing actions (BOOST_FUSION_ADAPT_STRUCT doesn't work when optimisation is disabled e.g -O0) 2016-01-26 19:09:38 +01:00
artemp
b6e8d02851 Merge branch 'master' into spirit-x3 2016-01-25 14:28:26 +01:00
artemp
fa5bbd99fa mapnik::value - refactor, synchronise and simplify comparisons implementations 2016-01-25 12:27:52 +01:00
artemp
9774f41b85 mapnik::value_null - add <,<=,>,>= implementations 2016-01-25 12:26:57 +01:00
Mickey Rose
0784e36754 add util::movable to complement util::noncopyable 2016-01-22 00:24:24 +01:00
Dane Springmeyer
e14fa647a1 fix yet more -Wshadow warnings 2016-01-21 14:13:55 -08:00
Dane Springmeyer
9b5f948c7f more g++ warning fixes 2016-01-21 13:56:29 -08:00
Dane Springmeyer
a9d58ee894 more warning fixes for g++-4.9 2016-01-21 13:39:30 -08:00
artemp
165e05b453 Merge branch 'master' into spirit-x3 2016-01-21 18:42:18 +01:00
artemp
0e836d7e20 mapnik::value - add value_bool/value_bool impl 2016-01-21 18:35:53 +01:00
artemp
85c3f5dbc1 improve type promotion across arithmetic ops 2016-01-21 18:14:55 +01:00
artemp
e100037288 mapnik::value - improve type promotion for impl::add 2016-01-21 12:47:56 +01:00
artemp
49f5606a67 Revert "expression_test - attempt to fix nested function calls" 
This reverts commit faaa841272.
 2016-01-20 14:03:00 +01:00
artemp
faaa841272 expression_test - attempt to fix nested function calls 2016-01-20 13:08:08 +01:00
artemp
d08b3d106b c++11 - use std::abs (http://en.cppreference.com/w/cpp/numeric/math/fabs) 2016-01-20 11:21:04 +01:00
Dane Springmeyer
e874f9237b silence more gcc shadow/unused warnings 2016-01-19 18:06:11 -08:00
Dane Springmeyer
85aae33925 avoid warnings in expression_grammar_x3_config.hpp 2016-01-19 13:00:42 -08:00
Dane Springmeyer
4432e93250 Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3 2016-01-19 12:25:36 -08:00
artemp
f41d515572 fix operator<< 2016-01-19 11:38:52 +00:00
artemp
c615708a2a restore local variant_io.hpp with specialisation for bool (https://github.com/mapnik/node-mapnik/issues/582) 2016-01-15 09:26:42 +00:00
Artem Pavlenko
7997f3725e Merge pull request #3235 from mapnik/raster_mem_ds 
Raster Type Memory Datasource
 2016-01-14 16:19:43 +00:00
artemp
3333f3e1fa inherit mapnik::util::variant from mapbox::variant and add mapbox::variant as submodule 2016-01-14 15:02:41 +00:00
Blake Thompson
044c21db13 Made it possible to change the type of a memory datasource by inspecting the features that are added to the memory datasource 2016-01-14 08:36:12 -06:00
artemp
7e5337b486 Merge branch 'master' into spirit-x3 2016-01-12 15:13:17 +00:00
artemp
0a5f006bb9 SVG : add support for stroke-dashoffset 2016-01-11 10:56:04 +00:00
artemp
d3fc7f8fed Merge branch 'master' into svg-dash-array 2016-01-08 16:08:11 +00:00
artemp
9494bc15d4 SVG path parser - correct handling optional separator (,) between multiple command parts (#3225) 
http://www.w3.org/TR/SVG/paths.html#PathElement
 2016-01-08 12:00:51 +00:00
artemp
a8bf7c72f9 Merge branch 'master' into svg-dash-array 2016-01-08 10:46:17 +00:00
artemp
c8932b3df3 svg2png : use SVG dimensions as a fallback when bounding box has zero width or height (e.g horizontal or vertical line) 2016-01-08 10:20:50 +00:00
artemp
b1c22ba853 SVG :initial support for "stroke-dasharray" 2016-01-07 15:54:34 +00:00
Artem Pavlenko
513cfa7c80 Merge pull request #3219 from mapnik/address-sanitizer-happy 
keep address-sanitizer happy ref (https://github.com/mapbox/mapnik-ve…
 2016-01-07 14:23:54 +00:00
artemp
ca83ca167d svg - move stroke-dasharray setup into dash-array parser method 2016-01-07 11:20:22 +00:00
artemp
e296e554a8 sync with 3ac6e46d01 2016-01-06 12:24:24 +00:00
artemp
50905c3f9a c++ style pedantic 2016-01-06 12:23:59 +00:00
artemp
7b2da35c01 fix typo doh 2016-01-05 19:52:36 +00:00
artemp
5cd3645cd1 keep address-sanitizer happy ref (https://github.com/mapbox/mapnik-vector-tile/pull/171) 2016-01-05 16:58:37 +00:00
artemp
11c6896520 Merge branch 'master' into spirit-x3 2016-01-05 10:25:23 +00:00
artemp
ee0395df7a add basic read/write header support (quad_tree + spatial_index) ref (#3216) 2016-01-05 10:20:21 +00:00
artemp
4b22e1075e Merge branch 'master' into spirit-x3 2015-12-17 12:07:25 +00:00
artemp
e0c756ee8d geometry_envelope - add missing linear_ring 2015-12-17 12:07:05 +00:00
artemp
1b1df8abce geometry_envelope - add missing linear_ring 2015-12-17 12:06:10 +00:00
Dane Springmeyer
bd21e452d1 fix minor header glitches to allow headers to compile standalone 2015-12-16 14:22:36 -08:00
Dane Springmeyer
a0719870ab remove out of date/unused header 2015-12-16 14:22:09 -08:00
Dane Springmeyer
ce98a5c811 fix header glitches uncovered by time-header script - refs #3208 2015-12-16 13:17:19 -08:00
artemp
fb94665fe3 fix reference in comment to point to CSS3 spec 2015-12-15 15:18:39 +00:00
artemp
209af16763 rename SVG2 back to CSS as it's a better fit 2015-12-15 15:16:18 +00:00
Dane Springmeyer
6e5a67c1fb Fix -Wshadow errors from boost - refs #3204 2015-12-14 13:40:23 -08:00
artemp
599b021175 support arbitrary (nested) attributes in JSON Geometry 2015-12-14 11:46:39 +00:00
artemp
6684019e86 support arbitrary (nested) attributes in JSON Geometry 2015-12-14 11:38:22 +00:00
artemp
b05e09700b add HSL(A) colors 2015-12-11 13:14:37 +00:00
artemp
b3d7552774 cleanup 2015-12-11 11:27:10 +00:00
artemp
90d5306f09 svg2 colors parser - add RGB(A) percentage syntax 2015-12-11 11:16:38 +00:00
artemp
e4a60d7c90 disable skipper for "hex" colours 2015-12-10 16:05:45 +00:00
artemp
b99cf8a2ca make member variables public to allow using BOOST_FUSION_ADAPT_STRUCT 2015-12-10 16:04:44 +00:00
artemp
09250ede96 add spirit x3 grammar for SVG2 colors (aka CSS colors) 2015-12-10 15:23:49 +00:00
artemp
b6cea7c658 use std::size_t to be complaint with STL containers + explicit types 2015-12-10 15:23:16 +00:00
artemp
f3b6955533 transform expressions - split grammar into *.hpp *_def.hpp and *.cpp 2015-12-09 11:53:57 +00:00
artemp
b7a54e5166 expression_grammar x3 - refactor quoted strings 2015-12-08 18:30:16 +00:00
artemp
da2335328b expression_grammar X3 - add support for single and double quoted arguments in regex functions 2015-12-07 12:19:30 +00:00
artemp
64f5de14b1 expression_grammar X3 - allow backtracking on '<' operator so we can parse '<>' correctly 2015-12-07 11:06:57 +00:00
Dane Springmeyer
9a109bbf7d Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3 2015-12-04 14:07:51 -05:00
Dane Springmeyer
50d1e2fbb3 handle more gcc 4.9 -Wshadow warnings 2015-12-04 14:07:42 -05:00
Dane Springmeyer
010714174e fix -Wshadow warnings 2015-12-04 12:01:39 -05:00
artemp
164d225f07 expression_node - remove unused operator's 2015-12-04 16:19:37 +00:00
artemp
9eee695425 remove unused boost::spirit::qi grammars 2015-12-04 16:03:44 +00:00
artemp
2acaa7f9f4 transform_expression - port parsing grammar to x3 2015-12-04 15:55:01 +00:00
artemp
8bf0cff8cb split expression_grammar_x3 into *.hpp *_def.hpp *_config.hpp and *.cpp for improved integration 2015-12-04 15:36:56 +00:00
artemp
3fc00049f6 expression_grammar_x3 - use lexeme 2015-12-04 13:52:31 +00:00
artemp
8200e1ffc7 transform_expression - add default ctors 2015-12-04 13:52:31 +00:00
artemp
dca41aea12 expression_grammar_x3 : fix attr and global attribute rule (enable skipping) + rule IDs 2015-12-04 13:52:31 +00:00
Dane Springmeyer
1ce9f76fa3 start fixing gcc 4.9 -Wshadow warnings 2015-12-04 13:52:31 +00:00
Dane Springmeyer
a58ef62fc2 start fixing gcc 4.9 -Wshadow warnings 2015-12-02 15:54:58 -05:00
Dane Springmeyer
1cbfbbcc1a iwyu 2015-12-02 12:48:05 -05:00
Dane Springmeyer
a55ff6b33e fix includes 2015-12-02 11:56:42 -05:00
artemp
51920be9a7 move #ifdef/#endif to include include directive and avoid redundant <memory> 2015-12-02 14:30:59 +00:00
artemp
e7e25bb122 expression_grammar_x3 - remove duplicate logical not (optimise) 2015-12-02 13:02:52 +00:00