artemp
f2c4ec86ea
Merge branch 'master' into spirit-x3
2016-02-11 10:19:01 +01:00
artemp
fa6376d9a1
update variant submodule
2016-02-11 10:18:16 +01:00
artemp
d5c0cfc9e8
update variant submodule
2016-02-11 10:14:42 +01:00
Dane Springmeyer
10bd37ddd7
avoid unneccesary dependence on << operator of mapnik::enumeration
2016-02-09 10:09:12 -08: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
668f708308
Merge branch 'master' into spirit-x3
2016-02-09 16:28:27 +01:00
Blake Thompson
1d981e899b
Merge pull request #3289 from lightmare/lts
...
bootstrap: relieve leaning toothpick syndrome
2016-02-09 09:26:26 -06:00
artemp
561fadd4ff
expression grammar - sync with master ( https://github.com/mapnik/mapnik/pull/3287 )
2016-02-09 16:24:37 +01:00
artemp
7811b779a0
Merge branch 'master' into spirit-x3
2016-02-09 16:02:35 +01:00
Mickey Rose
dea4a73927
bootstrap: relieve leaning toothpick syndrome
2016-02-09 15:06:09 +01:00
artemp
87c3032e63
Merge branch 'lightmare-expr-no-barewords'
2016-02-09 14:15:35 +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
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
6f33b8a5f1
Merge branch 'master' into spirit-x3
2016-02-09 11:45:37 +01:00
artemp
c53b4cdeda
update test data ref #3288
2016-02-09 11:44:55 +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
33bf3a009d
Merge branch 'master' into spirit-x3
2016-02-08 15:51:31 +01:00
artemp
2b725dd257
shapeindex - skip 'null' shapes (ref #3288 )
2016-02-08 15:51:13 +01:00
artemp
1c1817ddc1
shapeindex - skip 'null' shapes (ref #3288 )
2016-02-08 15:45:03 +01:00
bergwerkgis
9e7b67e35d
Merge branch 'master' of https://github.com/mapnik/mapnik
2016-02-08 13:55:25 +00:00
bergwerkgis
643391ba20
Windows: props file to override solution settings for /MP
2016-02-08 13:55:08 +00: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
b84eb8f2b0
Merge branch 'master' into spirit-x3
2016-02-08 08:53:25 +01:00
Mickey Rose
8da250a0ee
show build status badges for master (svg)
...
- Travis badge URL was .png
- AppVeyor badge used latest build (any branch)
- [skip ci]
2016-02-07 14:22:44 +01:00
Mickey Rose
ed8c8df738
expression_grammar: use one symbol table for all constants
2016-02-06 18:40:33 +01:00
Mickey Rose
ae39d48b86
test/expressions: add checks for logical operator precedence
2016-02-06 14:26:57 +01:00
lightmare
b24f520439
Merge pull request #3239 from lightmare/expr-test
...
condense expressions tests
2016-02-06 00:37:05 +01:00
Mickey Rose
5764d619f3
expressions test: move expression strings into Catch calls, continue on failure
2016-02-05 17:22:01 +01:00
Mickey Rose
53bb55eade
rename expresssions_test.cpp, didn't pass spell check
2016-02-05 17:22:01 +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
ee2277a610
Merge branch 'master' into spirit-x3
2016-02-05 13:04:06 +01:00
bergwerkgis
eeb1507c6d
AppVeyor: new try, nr.2
2016-02-05 11:13:09 +00:00
bergwerkgis
9d359ff3df
AppVeyor: new try, nr.1
2016-02-05 11:05:12 +00:00
Mickey Rose
7594301d98
test/shapeindex: include loop variables in failure message
...
[skip ci]
2016-02-04 18:54:21 +01:00
artemp
48127c3754
use clang-3.6 for spirit-x3 branch (c++14 support)
2016-02-04 16:49:10 +01:00
artemp
a25993fc9b
try JOBS=8/HEAVY_JOBS=4
2016-02-04 16:36:33 +01:00
artemp
8c1f71c39e
try 8 JOBS
2016-02-04 12:51:20 +01:00
artemp
c4ff46b243
Merge branch 'master' into spirit-x3
2016-02-04 11:38:24 +01:00
bergwerkgis
9282c60c91
AppVeyor: try again mapnik::value_null - correct <=, >= return values
2016-02-04 10:21:41 +00: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
Dane Springmeyer
7ad4bf379d
stick with clang-3.5 for now
...
- I have early evidence that mapnik compiled with 3.6 and mapnik-vt compiled with 3.5 == crashes
- Also the mason deps are still compiled with 3.5
- TODO: upgrade mapnik, mapnik-vt, and all mason deps to 3.6 all at once.
2016-02-03 11:18:00 -08:00
Dane Springmeyer
52cabfd107
expat is no longer a must have cairo dep since cairo can be built without fontconfig [skip ci]
2016-02-03 10:57:09 -08:00
