Commit graph

12125 commits

Author SHA1 Message Date
artemp
a69758fa7f remove bogus template instantiations 2016-10-11 13:08:56 +02:00
artemp
f2ea66a027 remove unused include directive 2016-10-11 12:32:34 +02:00
artemp
d32791bbf4 Merge branch 'master' into develop 2016-10-10 10:01:39 +02:00
Mickey Rose
d18e65dbdf travis: also search unknown submodule commit in branches 2016-10-05 20:03:45 +02:00
artemp
f2b0d9f605 update deps/mapbox/variant 2016-09-23 16:40:58 +02:00
artemp
6b27b94582 Fix clang >= 3.9.0 compilation by using mapbox::util::variant as alias (via deps/mapbox/variant => "types" branch) 2016-09-23 16:01:07 +02:00
artemp
44bdaf2ffa Merge branch 'master' into develop 2016-09-23 11:57:01 +02:00
artemp
a0a5085917 add GeoJSON num_features_to_query unit test (ref #3515) 2016-09-23 11:56:43 +02:00
artemp
dad0ca2071 clamp num_features_to_query to 1...max range (at least one feature will queried) + use std::size_t for feature count (ref #3515) 2016-09-23 11:56:32 +02:00
artemp
5d63733ae7 add GeoJSON num_features_to_query unit test (ref #3515) 2016-09-23 11:55:38 +02:00
artemp
b7b918d697 clamp num_features_to_query to 1...max range (at least one feature will queried) + use std::size_t for feature count (ref #3515) 2016-09-23 11:52:56 +02:00
artemp
03f1e49818 GeoJSON feature/geometry grammars - split (a | b | ...) % lit(',') rule to avoid creating bogus temp synthesised attribute e.g boost::variant<a,b,..> which causes clang compiler >= 3.9 to segfault. (ref #3507)
NOTE: In general many Boost.Spirit gotchas can be fixed by simplifying rules (better control what gets synthesied under the bonet)
2016-09-22 12:24:53 +02:00
artemp
8a8427daed GeoJSON feature/geometry grammars - split (a | b | ...) % lit(',') rule to avoid creating bogus temp synthesised attribute e.g boost::variant<a,b,..> which causes clang compiler >= 3.9 to segfault. (ref #3507)
NOTE: In general many Boost.Spirit gotchas can be fixed by simplifying rules (better control what gets synthesied under the bonet)
2016-09-22 12:18:34 +02:00
artemp
34e1096788 GeoJSON generator - implement using geometry<double> karma adapters 2016-09-20 11:01:38 +02:00
artemp
a34cb6c2a3 remove unused rule 2016-09-20 10:55:38 +02:00
artemp
9d05667723 add specialisations for coord_type = std::int64_t 2016-09-20 10:55:00 +02:00
artemp
ba573e558b remove redundant and bogus enum value 2016-09-19 16:55:25 +02:00
artemp
fc481b171d wkt generator - remove boost::phoenix headers 2016-09-19 16:54:54 +02:00
artemp
6e010cbbd0 mapnik::geometry - refactor karma adaper into separate header for re-use 2016-09-19 16:32:40 +02:00
artemp
d67410f82a fix typo 2016-09-19 15:56:15 +02:00
artemp
8ddbd18d20 adapt mapnik::geometry::geometry<double> to work with boost::spirit::karma + simplify and optimise WKT generator 2016-09-19 15:51:21 +02:00
artemp
7197a946fa variant - pin to 'types' branch (requires types typedef) 2016-09-19 15:49:18 +02:00
artemp
545b32eaf5 refactor path_expression_grammar 2016-09-15 15:41:31 +02:00
artemp
c03cb2d434 consistently return x3 grammars by const& 2016-09-15 15:40:38 +02:00
artemp
dfbe7fd893 wkt x3 - add missing file 2016-09-14 11:15:18 +02:00
artemp
e4e628ecd5 upgrade WKT grammar to boost::spirit::x3 2016-09-13 15:11:05 +02:00
artemp
46fe1d6f4a Merge branch 'master' into develop 2016-09-12 12:59:34 +02:00
artemp
094994ef54 update CHANGELOG for mapnik v3.0.12 release [skip ci] 2016-09-08 10:36:21 +02:00
Dane Springmeyer
1d22d860af Merge pull request #3513 from lightmare/fix-image-swap
Fix image swap
2016-09-07 21:03:32 -07:00
Dane Springmeyer
cbe86b0c59 add script for 'make test-release' 2016-09-07 21:02:04 -07:00
Dane Springmeyer
b6a48ff354 fixes to automated release process 2016-09-07 19:53:01 -07:00
Dane Springmeyer
c6c94e760e release process: move to github releases 2016-09-07 16:54:39 -07:00
Mickey Rose
870b890042 remove redundant member pData_ from mapnik::image
I believe this is better than fixing swap() by also
swapping pData_
2016-09-07 20:03:17 +02:00
Mickey Rose
e25bc271ec add unit test for image::swap 2016-09-07 19:23:36 +02:00
artemp
4f008c6f2f update CHANGELOG for mapnik v3.0.12 release [skip ci] 2016-09-07 09:54:07 +02:00
artemp
dcf3857d32 setting up for mapnik v3.0.12 release [skip ci] 2016-09-07 09:51:59 +02:00
artemp
7d3d088a79 Merge branch 'master' into develop 2016-09-06 10:00:26 +02:00
Dane Springmeyer
b481d62d3d block invalid publish [skip ci] 2016-09-06 00:26:45 -07:00
Dane Springmeyer
48316d47b0 fixes for auto-release script 2016-09-06 00:21:20 -07:00
Dane Springmeyer
4cc0706940 start working on #3335 2016-09-06 00:21:20 -07:00
bergwerkgis
49a1799d4f Merge branch 'master' of https://github.com/mapnik/mapnik 2016-09-05 14:00:34 +00:00
bergwerkgis
28162f0720 [skip travis] fix relative path to get-boost-icu-version-from-sdk.ps1 (differs when called from windows-builds) 2016-09-05 14:00:17 +00:00
artemp
66999f1f87 travis up from 35 to 40 min 2016-09-05 15:54:40 +02:00
artemp
014f98043f add missing include path 2016-09-05 15:41:14 +02:00
artemp
fc0b57de24 update CHANGELOG 2016-09-05 15:41:14 +02:00
bergwerkgis
a79bd73105 refs #3509, get boost and icu versions directly from SDK files 2016-09-05 13:13:24 +00:00
artemp
d06cfff0ad Merge branch 'master' into develop 2016-09-05 11:40:22 +02:00
artemp
747ca7470c remove duplicate #pragma 2016-09-05 11:39:36 +02:00
artemp
f322d95f3e Merge branch 'master' into develop 2016-09-05 11:38:57 +02:00
Dane Springmeyer
3741a7f348 fix -Wshadow warnings caught by g++-5 2016-09-03 09:58:40 -07:00