artemp
e6ad70468f
prune include directives a bit more
2016-02-24 12:23:03 +01:00
artemp
7ab4d9ad0b
add required include
2016-02-24 12:09:33 +01:00
artemp
5535aa292f
Merge branch 'master' into spirit-x3
2016-02-24 12:05:35 +01:00
Artem Pavlenko
04c2532a81
Merge pull request #3302 from lightmare/travis
...
move some shell code from .travis.yml to separate script
2016-02-24 12:04:41 +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
0c9a615c24
restore back compatibility shim ref #1859 (TODO: must go away in 3.1.x!!)
2016-02-23 14:01:06 +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
72e9e81d97
Merge branch 'master' into spirit-x3
2016-02-19 15:06:16 +01:00
artemp
9fe049d8af
CSV utils - strengthen quote detection logic + tests
2016-02-19 15:05:15 +01:00
artemp
c0c4a7bf6b
Merge branch 'master' into spirit-x3
2016-02-19 11:30:22 +01:00
artemp
62de76a66e
test bogus *.index files are handled correctly (ref #3300 ) + indirectly tests #3306 via requiring mapped_memory_cache::instance().clear()
2016-02-19 11:25:27 +01:00
artemp
c4817f7ae1
clear mapped_memory_cache to ensure new '*.index` are used (MAPNIK_MEMORY_MAPPED_FILE) (ref #3306 )
2016-02-19 11:02:12 +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
6a9240f3d4
Revert "shape.input - add 'update-cache' optional parameter (default:true)" -- no much use as OS seems to apply it's own caching, doh ..
...
This reverts commit f65c799475
2016-02-18 17:37:46 +01:00
artemp
eb1a23d6e4
'invalid index' - testing invalid *.index fallback (ref #3300 )
2016-02-18 17:36:18 +01:00
artemp
f65c799475
shape.input - add 'update-cache' optional parameter (default:true)
2016-02-18 17:34:03 +01:00
artemp
085a2afe40
minor formatting
2016-02-18 17:17:44 +01:00
Mickey Rose
efb06d2060
travis: move some shell code to separate script
...
- refs #3291
2016-02-18 15:40:13 +01:00
artemp
b7dd8331df
use std::ofstream (ref 3300)
2016-02-18 12:54:17 +01:00
artemp
c646fa686c
Merge branch 'master' into spirit-x3
2016-02-18 11:46:26 +01:00
artemp
b43ee6dd04
beef up has_index method to check if *.index file is valid (has expected header) (ref #3300 )
2016-02-18 11:45:58 +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
artemp
cd5105785a
csv_utils - fix istringstream initialiser by using explicit iterators pair std::string ctor
2016-02-18 11:35:14 +01:00
artemp
4c0781dbe9
remove redundant unique_ptr usage for local variable
2016-02-18 10:53:12 +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
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
