Commit graph

11498 commits

Author SHA1 Message Date
artemp
834f354c6b Merge branch 'master' into spirit-x3 2016-01-04 11:47:01 +00:00
artemp
a2b3130d4b rebase to master (remove spirit-x3 changes) 2016-01-04 11:43:27 +00:00
Jiri Drbalek
9ad6ee2999 visual tests: fix vector initialization 2015-12-28 09:30:46 +00:00
Blake Thompson
dfa62c88d8 fix for santize address errors 2015-12-27 21:40:10 -06:00
Dane Springmeyer
cb7ed7bc80 Merge pull request #3210 from mapnik/windows-python-bindings
Windows: pull python bindings
2015-12-23 08:12:02 -08:00
bergwerkgis
630640ee6c Windows: pull python bindings, too. 2015-12-23 12:48:43 +01:00
artemp
4b22e1075e Merge branch 'master' into spirit-x3 2015-12-17 12:07:25 +00:00
artemp
e0c756ee8d geometry_envelope - add missing linear_ring 2015-12-17 12:07:05 +00:00
artemp
1b1df8abce geometry_envelope - add missing linear_ring 2015-12-17 12:06:10 +00:00
Dane Springmeyer
bd21e452d1 fix minor header glitches to allow headers to compile standalone 2015-12-16 14:22:36 -08:00
Dane Springmeyer
a0719870ab remove out of date/unused header 2015-12-16 14:22:09 -08:00
Dane Springmeyer
ce98a5c811 fix header glitches uncovered by time-header script - refs #3208 2015-12-16 13:17:19 -08:00
Dane Springmeyer
e3a1108ebd Add a script to time how long it takes to compile a header inside mapnik 2015-12-16 13:02:05 -08:00
bergwerkgis
eff087c0cf [skip ci] Windows: only manipulate page file settings on AppVeyor 2015-12-16 14:19:55 +00:00
bergwerkgis
1a49fe20fb AppVeyor: set powershell execution policy 2015-12-16 12:04:35 +00:00
bergwerkgis
34f7c86caf AppVeyor: try to increase page file size via powershell 2015-12-16 11:29:22 +00:00
bergwerkgis
d75fd12eab Windows: output pagefile size on AppVeyor (compiler out of heapspace) 2015-12-16 10:56:05 +00:00
bergwerkgis
e1498deaa8 [skip ci]
Windows:
* read Boost version from AppVeyor.yml
* init submodules from build-local.bat
2015-12-15 19:51:31 +00:00
artemp
fb94665fe3 fix reference in comment to point to CSS3 spec 2015-12-15 15:18:39 +00:00
artemp
209af16763 rename SVG2 back to CSS as it's a better fit 2015-12-15 15:16:18 +00:00
Dane Springmeyer
6254b3851e Merge branch 'master' of github.com:mapnik/mapnik into postgis-tests-squashed 2015-12-14 15:28:04 -08:00
Dane Springmeyer
75cb954d26 update test-data to include new postgis sql 2015-12-14 15:27:48 -08:00
Dane Springmeyer
fc6556170d let's not depend on CREATE EXTENSION working in C++ code 2015-12-14 15:27:05 -08:00
Dane Springmeyer
b42f072ad3 wip: start chipping away at getting tests running - refs #3180 2015-12-14 15:00:10 -08:00
Dane Springmeyer
dc109a7ae2 Merge branch 'master' of github.com:mapnik/mapnik into postgis-tests-squashed 2015-12-14 13:45:29 -08:00
Dane Springmeyer
6e5a67c1fb Fix -Wshadow errors from boost - refs #3204 2015-12-14 13:40:23 -08:00
Dane Springmeyer
2222ca9b95 Merge pull request #3197 from tomhughes/nik2img
Fix name reported by mapnik-render
2015-12-14 13:33:42 -08:00
artemp
d21d49a8ef Merge branch 'master' into spirit-x3 2015-12-14 14:15:08 +00:00
artemp
3139dad5cd don't bother iterating over geometries if shape_type is shape_null in header 2015-12-14 14:11:38 +00:00
artemp
4e7175762e Merge branch 'master' into spirit-x3 2015-12-14 11:48:50 +00:00
artemp
6ca0e34a80 mapnik-index - output failed feature JSON when both --validate-features and --verbose options present. 2015-12-14 11:47:19 +00:00
artemp
5e2f3ce61d geojson/geometry - update unit test 2015-12-14 11:46:39 +00:00
artemp
599b021175 support arbitrary (nested) attributes in JSON Geometry 2015-12-14 11:46:39 +00:00
artemp
1dff366897 geojson/geometry - update unit test 2015-12-14 11:39:42 +00:00
artemp
6684019e86 support arbitrary (nested) attributes in JSON Geometry 2015-12-14 11:38:22 +00:00
artemp
c71e7c622d mapnik-index - output failed feature JSON when both --validate-features and --verbose options present. 2015-12-14 11:36:21 +00:00
artemp
f2d10db402 add HSL(A) tests 2015-12-11 13:18:00 +00:00
artemp
b05e09700b add HSL(A) colors 2015-12-11 13:14:37 +00:00
artemp
428641452c add more color unit tests 2015-12-11 11:27:27 +00:00
artemp
b3d7552774 cleanup 2015-12-11 11:27:10 +00:00
artemp
90d5306f09 svg2 colors parser - add RGB(A) percentage syntax 2015-12-11 11:16:38 +00:00
artemp
bcfa73c85d use svg2_color parser 2015-12-10 16:06:58 +00:00
artemp
e4a60d7c90 disable skipper for "hex" colours 2015-12-10 16:05:45 +00:00
artemp
b99cf8a2ca make member variables public to allow using BOOST_FUSION_ADAPT_STRUCT 2015-12-10 16:04:44 +00:00
artemp
09250ede96 add spirit x3 grammar for SVG2 colors (aka CSS colors) 2015-12-10 15:23:49 +00:00
artemp
b6cea7c658 use std::size_t to be complaint with STL containers + explicit types 2015-12-10 15:23:16 +00:00
artemp
f3b6955533 transform expressions - split grammar into *.hpp *_def.hpp and *.cpp 2015-12-09 11:53:57 +00:00
artemp
b7a54e5166 expression_grammar x3 - refactor quoted strings 2015-12-08 18:30:16 +00:00
artemp
3a0cbfd081 Merge branch 'master' into spirit-x3 2015-12-08 16:43:46 +00:00
artemp
e65cb96743 sync expressions tests with spirit-x3 branch 2015-12-08 16:39:32 +00:00