artemp
4659f40401
make svg_path_grammar and svg_points_grammar stateless ref #3343
...
(https://github.com/mapnik/mapnik/pull/2231 )
2016-03-04 12:42:44 +01:00
artemp
12aec35e2f
GeoJSON feature_grammar - make ctor explicit
2016-03-04 11:35:38 +01:00
artemp
4f8bc40b83
update old boost::phoenix syntax
2016-03-04 10:25:03 +01:00
Dane Springmeyer
23fb010ea2
disable dlclose when building with --coverage - refs #3344
2016-03-03 15:02:03 -08:00
Dane Springmeyer
833703026d
add COVERAGE configure option - only set coverage flags on libmapnik and plugins - refs #3344
2016-03-03 14:19:12 -08:00
Dane Springmeyer
fde36984de
minor unit test cleanups to prepare to test amalgamation
2016-03-03 10:53:58 -08:00
Dane Springmeyer
4173fff42c
add svg parsers to pre-compile [skip ci]
2016-03-03 10:15:29 -08: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
a855a12532
make code comment about needing immutable grammars - refs #3342 [skip ci]
2016-03-03 09:14:06 -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
artemp
77eaaa1259
move vertex_adapters implementation into .cpp - mark extern
2016-03-01 21:55:47 +01:00
artemp
053faa8a27
remove unused vars/cleanup
2016-03-01 20:49:54 +01:00
artemp
bb78b178cd
reuse type
2016-03-01 20:37:23 +01:00
artemp
4c8928dd8c
Merge branch 'master' into value-cpp
2016-03-01 17:43:02 +01:00
artemp
d374829b30
refactor apply_markers_multi and help compiler a bit more (re-enable support for GEOMETRYCOLLECTION)
2016-03-01 17:29:03 +01:00
artemp
45b54c703c
apply_marker_multi - unroll template instantiation logic + drop 'GeometryCollection' support (experimental)
2016-03-01 17:28:09 +01:00
artemp
566c99807f
minor formatting
2016-03-01 17:27:59 +01:00
artemp
82ac4e0976
refactor apply_markers_multi and help compiler a bit more
2016-03-01 17:26:47 +01:00
artemp
9e0d69bbd5
apply_marker_multi - unroll template instantiation logic + drop 'GeometryCollection' support (experimental)
2016-03-01 16:48:23 +01:00
artemp
345c0a5269
minor formatting
2016-03-01 14:41:19 +01:00
artemp
5ef5444fff
Merge branch 'master' into spirit-x3
2016-03-01 14:12:19 +01:00
artemp
d0fd99f75c
remove redundant #include
2016-03-01 14:11:54 +01:00
bergwerkgis
bd4c97f82d
[skip ci] AppVeyor: update %ICU_VERSION%
2016-02-29 13:58:59 +00:00
bergwerkgis
820ab82de9
[skip ci] AppVeyor: enable Postgres (for tests)
2016-02-29 13:37:09 +00:00
Mickey Rose
930056f5db
benchmarks: fix over-width number formatting issue
2016-02-28 01:04:35 +01:00
Mickey Rose
db58b8b578
benchmarks: synchronize threads before starting the benchmark
2016-02-28 00:28:00 +01:00
Mickey Rose
02286bb7d1
benchmarks: report iterations per second instead of the inverse
2016-02-27 22:23:28 +01:00
Mickey Rose
3fdc799e84
benchmarks: rename option --log-severity to --log for consistency
...
- haven't noticed before that test/visual/run already had --log,
and test/unit/run received that option recently
- pass --log=none by default in benchmark/run script
2016-02-27 22:19:08 +01:00
