artemp
a4c4c5e542
Merge branch 'master' into spirit-x3
2016-02-17 12:11:53 +01:00
artemp
d7d22276c0
Merge branch 'lightmare-benchanting'
2016-02-17 12:07:19 +01:00
artemp
9aed60a1e6
Merge branch 'benchanting' of https://github.com/lightmare/mapnik into lightmare-benchanting
2016-02-17 12:07:06 +01:00
artemp
c72e3b7a2f
Merge branch 'lightmare-to-string'
2016-02-17 10:52:54 +01:00
artemp
de409410a0
Merge branch 'to-string' of https://github.com/lightmare/mapnik into lightmare-to-string
2016-02-17 10:51:20 +01:00
artemp
005959d81c
Merge branch 'master' into spirit-x3
2016-02-17 09:49:56 +01:00
Dane Springmeyer
f014041d9c
restore intended variant version - partial revert of 93c4974b1 - refs #3297
2016-02-16 17:07:34 -08:00
Mickey Rose
8762e1d034
benchmarks: add option --min-duration=SECONDS
...
- with this option test_runner() will be called repeatedly (doing the
given number of --iterations each time) until SECONDS have elapsed
- added output column showing average time per iteration, should help
when comparing different runs
- shrinked the # of iterations column using k/M suffixes
2016-02-17 01:30:32 +01:00
Dane Springmeyer
93c4974b1b
fix PYTHONUSERBASE - broken since b3170c397c [skip ci]
2016-02-16 13:23:34 -08:00
Dane Springmeyer
4beda3bc46
fix #3290
2016-02-16 12:30:40 -08:00
Mickey Rose
2f303e4da4
benchmarks: helper class for running a sequence of tests
2016-02-16 19:53:03 +01:00
Mickey Rose
29c4f730eb
benchmarks: fix errors in non-compiling sources
2016-02-16 19:38:09 +01:00
Mickey Rose
ece5b93f08
benchmarks: add option --log-severity
...
this option is applied immediately after parsing args to override
MAPNIK_DEFAUL_LOG_SEVERITY
2016-02-16 18:37:24 +01:00
Mickey Rose
90fcdc90d3
benchmarks: fix output formatting
...
snprintf is a better tool for this task, anyway, but here's what was
wrong with the stream formatting:
s << name << ":" << std::setw(45 - (int)s.tellp())
cannot be used to align columns, tellp() may return any of:
0
name.length()
name.length() + strlen(":")
because the compiler is allowed to reorder the evaluation of
sub-expressions as it likes -- it may evaluate s.tellp() before
evaluating (s << name) or in-between (s << name) and (s << ":")
try with gcc-4.8
2016-02-16 16:27:32 +01:00
artemp
da310a9653
Merge branch 'master' into spirit-x3
2016-02-16 16:09:20 +01:00
artemp
15f905b272
csv - improved quote auto-detection logic which should catch more corner cases
2016-02-16 16:05:12 +01:00
artemp
7cbfe62af8
fix log string
2016-02-16 11:39:38 +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
ff54a14e34
update deps
2016-02-15 13:57:54 +01:00
artemp
ca0c0e5888
csv_util - combine auto-decting separator/quote/newline into one method std::tuple<char, bool, char, char> autodect_csv_flavour(T & stream, std::size_t file_length)
2016-02-15 13:55:06 +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
lightmare
f4bb28b2c1
Merge pull request #3292 from lightmare/to-string
...
to_expression_string should re-escape backslashes and quotes
2016-02-15 04:10:36 +01:00
Mickey Rose
2d88fec458
to_expression_string: fix backslash-escapes in strings
2016-02-15 02:45:29 +01:00
Mickey Rose
f19b8e8eff
test/expressions: add checks for backslash-escapes in strings
2016-02-15 02:23:19 +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
bd6445cedc
update deps - variant
2016-02-11 16:27:19 +01:00
artemp
bfb93c7222
Merge branch 'lightmare-trim-filter-grammar'
2016-02-11 15:43:28 +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
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
