sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11809 commits 112 branches 95 tags 181 MiB
Commit graph

11809 commits

This branch
This branch
All branches
Author SHA1 Message Date
artemp
cdeb806371 box2d operator<< - output "box2d(INVALID)" for invalid box. 2016-03-08 15:02:54 +01:00
Mickey Rose
a8b8f2e001 markers_placement_finder: dispatch by switch(placement_type) 2016-03-08 15:02:54 +01:00
Mickey Rose
d9339e4bfc un-template markers_basic_placement 
- move Locator/Detector-dependent stuff back to markers_point_placement
- slightly reduces library size, by about 20% of what #3338 added
 2016-03-08 15:02:54 +01:00
Dane Springmeyer
b02a8c3caf [travis] fix invalid bash on osx [skip ci] 2016-03-08 15:02:54 +01:00
Dane Springmeyer
1f0d96b983 remove earlier debug 2016-03-08 15:02:54 +01:00
Dane Springmeyer
b520e30cac more ccache debugging 2016-03-08 15:02:53 +01:00
Dane Springmeyer
bfef100505 upgrade ccache 2016-03-08 15:02:53 +01:00
Dane Springmeyer
c38aecdd3a debug ccache - refs #3350 2016-03-08 15:02:53 +01:00
Dane Springmeyer
daa1012e02 disable benchmarks from running on travis - refs #3351 2016-03-08 15:02:53 +01:00
Dane Springmeyer
b0f594eea1 Fix ccache stomping - refs #3350 2016-03-08 15:01:57 +01:00
Dane Springmeyer
973b461a54 [travis] switch coverage run to linux - closes #3344 2016-03-08 15:01:05 +01:00
Jiri Drbalek
348067dcfd raster scaling: use mapnik::safe_cast, fixes clipping negative floats 2016-03-08 14:58:44 +01:00
Jiri Drbalek
9b72dd868f raster scaling: a bit of optimization 2016-03-08 14:58:44 +01:00
Jiri Drbalek
93a34cc68d raster scaling: check for division by zero 2016-03-08 14:58:44 +01:00
artemp
53c643092c css_color_grammar + image_filters_grammar - move phoenix into ctors 2016-03-08 14:58:44 +01:00
artemp
a80c85bff8 split svg_path_grammar,svg_points_grammar,svg_transform_grammar into *.hpp, *_impl.hpp + move boost::phoenix::function initialisation into ctor's 
(ref #3343)
 2016-03-08 14:58:23 +01:00
Jiri Drbalek
f5d6b19fb4 raster scaling: fix accessing out of bounds pixels 2016-03-08 14:58:23 +01:00
artemp
196b24c972 make svg_transform_grammar stateless ref #3343 
(https://github.com/mapnik/mapnik/pull/2231)
 2016-03-08 14:58:23 +01:00
artemp
7b452c18e0 make svg_path_grammar and svg_points_grammar stateless ref #3343 
(https://github.com/mapnik/mapnik/pull/2231)
 2016-03-08 14:58:23 +01:00
artemp
43ec5d3a07 GeoJSON feature_grammar - make ctor explicit 2016-03-08 14:58:23 +01:00
artemp
9b9e0f5b64 update old boost::phoenix syntax 2016-03-08 14:58:23 +01:00
Dane Springmeyer
d2df889b47 disable dlclose when building with --coverage - refs #3344 2016-03-08 14:57:23 +01:00
Dane Springmeyer
29e78e15ec add COVERAGE configure option - only set coverage flags on libmapnik and plugins - refs #3344 2016-03-08 14:57:23 +01:00
Dane Springmeyer
9457957fe8 minor unit test cleanups to prepare to test amalgamation 2016-03-08 14:57:23 +01:00
Dane Springmeyer
2e9fd43095 add svg parsers to pre-compile [skip ci] 2016-03-08 14:57:22 +01:00
Dane Springmeyer
baf12bbeac make code comment about needing immutable grammars - refs #3342 [skip ci] 2016-03-08 14:57:22 +01:00
Dane Springmeyer
9baec5c22f Merge branch 'master' of github.com:mapnik/mapnik into spirit-x3 2016-03-03 09:32:25 -08:00
Dane Springmeyer
4c369f7b68 add more files to pre-build that take a long time [skip ci] 2016-03-03 08:05:05 -08:00
Dane Springmeyer
9adafd71df avoid -Wshadow warning from boost [skip ci] 2016-03-03 07:36:33 -08:00
artemp
65e81848ba Merge branch 'master' into spirit-x3 2016-03-03 12:04:55 +01:00
artemp
cbef855743 spirit grammars - move BOOST_FUSION_ADAPT_ADT into implementation files (*_impl.hpp) + reduce boost::phoenix includes to make headers lighter to include 2016-03-03 11:50:41 +01:00
Mickey Rose
ec2c5ddbdc gdal: RAII + minor cleanup 2016-03-03 01:48:07 +01:00
Mickey Rose
489631ca34 remove reference on template parameter Detector 2016-03-03 00:17:41 +01:00
Mickey Rose
c8e3a0d549 refactor render_markers_symbolizer_visitor 
- extract some common code into functions
- for cleaner dif: git show -w --patience
 2016-03-03 00:07:18 +01:00
Dane Springmeyer
b5ac75cdf0 MAPNIK_DECL breaks on windows when compiled into static libmapnik-json.a 2016-03-02 13:56:01 -08:00
lightmare
80d9aebb79 Merge pull request #3340 from lightmare/gdal-register-once 
call GDALAllRegister once, from one thread only
 2016-03-02 22:19:07 +01:00
Dane Springmeyer
296f8d467d avoid grammar_impl usage in headers - other minor refactoring around json spirit 2016-03-02 12:48:07 -08:00
Dane Springmeyer
024cb86eff travis osx machines have 2 cores, so let's limit to 4 jobs 2016-03-02 12:47:32 -08:00
Dane Springmeyer
4edb57bf11 Merge pull request #3315 from mapnik/faster-csv-compile 
Speed up CSV plugin / mapnik-index compile
 2016-03-02 12:22:16 -08:00
Mickey Rose
d4566c28d2 gdal: only register drivers once 
- refs #3339, #3093
 2016-03-02 21:21:59 +01:00
Dane Springmeyer
10a9dba143 trim includes in json/error_handler.hpp 2016-03-02 12:17:12 -08:00
Dane Springmeyer
d148a966c8 from_geojson/to_geojson are now used in unit tests, csv plugin, and node-mapnik so move these to cpp 2016-03-02 11:26:56 -08:00
Dane Springmeyer
72459b3140 Merge branch 'master' of github.com:mapnik/mapnik into faster-csv-compile 2016-03-02 11:10:23 -08:00
Dane Springmeyer
31171824ec Merge pull request #3326 from lightmare/faster-csv-compile 
merge mapnik-index::process_csv_file and csv_datasource::parse_csv
 2016-03-02 10:47:05 -08:00
artemp
9138d64725 value.hpp - fix error C2375: redefinition; different linkage 2016-03-02 17:15:05 +01:00
artemp
a549803b5b to_utf8 : fix visibility via MAPNIK_DECL 2016-03-02 17:02:25 +01:00
artemp
f11cc5920f revive lost to_utf8 method but move it into '<mapnik/unicode.hpp>' 2016-03-02 16:47:55 +01:00
artemp
65da617ec0 re-use vector_converter + move apply_marker_multi into *.cpp 2016-03-02 16:20:10 +01:00
artemp
ff7d04f209 Merge branch 'lightmare-markers-placements-union' 2016-03-02 12:48:26 +01:00
Mickey Rose
66e7ef58d7 refactor markers_placement_finder 
- refs #3327

Replace member variant of placement-type implementations with plain
union. The active implementation is chosen at construction time like
before.

Make placement-type implementation classes virtual to allow invoking
the active union member through a base class pointer.
 2016-03-02 00:53:45 +01:00