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

3983 commits

Author SHA1 Message Date
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
c646fa686c Merge branch 'master' into spirit-x3 2016-02-18 11:46:26 +01:00
artemp
5183c1da44 spatial_index - rename check_header to check_spatial_index and make it free function ref #3300 2016-02-18 11:38:29 +01:00
Mickey Rose
6557394dc8 re-add mapnik::to_utf8 stub for backward compatibility 2016-02-17 16:56:21 +01:00
artemp
a4c4c5e542 Merge branch 'master' into spirit-x3 2016-02-17 12:11:53 +01:00
artemp
afa34340d8 expression_grammar - fix functions arguments parser by moving no_skip directive inside enclosing quotes. 2016-02-16 09:31:55 +01:00
Mickey Rose
1499475d04 remove to_utf8, instead use UnicodeString::toUTF8String 2016-02-15 21:07:01 +01:00
artemp
04755f1a9b Merge branch 'master' into spirit-x3 2016-02-15 16:24:25 +01:00
artemp
349b7e6786 Merge branch 'master' into spirit-x3 2016-02-15 16:11:18 +01:00
Mickey Rose
5d1fd56cef csv_grammar: make csv_white_space_skipper a primitive_parser 2016-02-15 15:17:26 +01:00
Mickey Rose
ccf579f450 csv_grammar: simplify csv_line_grammar 2016-02-15 15:15:51 +01:00
artemp
a9e1388b3b csv_grammar - always requre matching closing quoting character 2016-02-15 12:02:45 +01:00
artemp
5994eb463a Merge branch 'master' into spirit-x3 2016-02-15 09:56:50 +01:00
Mickey Rose
2d88fec458 to_expression_string: fix backslash-escapes in strings 2016-02-15 02:45:29 +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
edc2e75474 Merge branch 'trim-filter-grammar' of https://github.com/lightmare/mapnik into lightmare-trim-filter-grammar 2016-02-11 15:43:18 +01:00
artemp
f2c4ec86ea Merge branch 'master' into spirit-x3 2016-02-11 10:19:01 +01:00
Dane Springmeyer
8ecb42894f restore << operator for mapnik::enumeration + add unit test 2016-02-09 10:08:29 -08:00
Dane Springmeyer
6c1b6e301d gradient does not need to be a fancy enumeration 2016-02-09 09:56:57 -08:00
artemp
561fadd4ff expression grammar - sync with master (https://github.com/mapnik/mapnik/pull/3287) 2016-02-09 16:24:37 +01:00
artemp
f0cc65958f Merge branch 'expr-no-barewords' of https://github.com/lightmare/mapnik into lightmare-expr-no-barewords 2016-02-09 14:15:22 +01:00
artemp
5aaf82b1b5 fix naming clash (color_blind_filter) 2016-02-09 13:44:34 +01:00
artemp
8102827215 json - split/refactor geojson grammars more 2016-02-09 13:21:20 +01:00
Mickey Rose
15f841213a expression_grammar: restrict unquoted strings to single-atom expressions 
- fixes #3017
- closes #3214
 2016-02-08 17:15:13 +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
Mickey Rose
ed8c8df738 expression_grammar: use one symbol table for all constants 2016-02-06 18:40:33 +01:00
Mickey Rose
959d4ded23 image_filter_grammar: rewrite using Nabialek trick 2016-02-06 02:03:55 +01:00
artemp
cb708d7f5a transform_grammar: correct and simplify rules per bcc7495a87 (commitcomment-15915607) 
image_filter: relax `agg-stack-blur` rule to allow `agg-stack-blur,agg-stack-blur(),agg-stack-blur(1),agg-stack-blur(1,1)` syntax + add image filter parsing tests
 2016-02-05 16:50:49 +01:00
artemp
3af34690c0 transform_grammar: correct and simplify rules per bcc7495a87 (commitcomment-15915607) 
image_filter: relax `agg-stack-blur` rule to allow `agg-stack-blur,agg-stack-blur(),agg-stack-blur(1),agg-stack-blur(1,1)` syntax + add image filter parsing tests
 2016-02-05 16:34:22 +01:00
artemp
bcc7495a87 transform grammar - fix optional seprator logic 2016-02-05 13:08:17 +01:00
artemp
59f818fe2d transform grammar - fix optional separator logic 2016-02-05 13:05:15 +01:00
artemp
fc037cb62b agg_stack_blur - add ctors 2016-02-05 13:04:36 +01:00
artemp
7ab93a30f2 mapnik::value_null - correct <=, >= return values ref #3285 2016-02-04 10:06:11 +01:00
artemp
835e60d900 mapnik::value_null - correct <=, >= return values ref #3285 2016-02-04 10:04:27 +01:00
artemp
d416f9fb7b Merge branch 'master' into spirit-x3 2016-02-03 17:24:11 +01:00
artemp
35ab8cccdc follow up on previous commit - convert to common_type prior applying / (MSCV C4804) 2016-02-03 12:45:29 +01:00
artemp
376ffba7fe convert value_bool to value_integer before operator / (fixes unsafe use of bool - MSVC C4804) 2016-02-03 12:35:09 +01:00
artemp
c0724a6d95 value comparison - deduct return type automatically (fixes MSVC C4800) 2016-02-03 12:33:15 +01:00
Dane Springmeyer
1600bfe981 remove dead code in enumeration.hpp 2016-02-02 12:35:19 -08:00
Dane Springmeyer
09f137796d use std namespace for clib functions and fix spelling in comments 2016-02-02 12:35:19 -08: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
39a97865fc image_filter_grammar - move 'BOOST_FUSION_ADAPT_STRUCT` into *_impl.hpp 2016-02-02 11:30:00 +01:00
artemp
4122826031 image_filter_grammar - move 'BOOST_FUSION_ADAPT_STRUCT` into *_impl.hpp 2016-02-02 11:23:08 +01: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
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