Dane Springmeyer
|
9428f7f018
|
csv plugin: fix syntax after merge
|
2013-11-03 23:17:40 -08:00 |
|
Dane Springmeyer
|
f998b2bda6
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
deps/agg/build.py
deps/clipper/build.py
include/mapnik/feature_style_processor_impl.hpp
plugins/input/csv/csv_datasource.cpp
|
2013-11-03 23:10:21 -08:00 |
|
Dane Springmeyer
|
26f362db9a
|
scons: do not (yet) default to using -Wconversion -Wno-sign-conversion
|
2013-11-03 23:07:03 -08:00 |
|
Dane Springmeyer
|
2d268d3a95
|
features_with_context: no need for default arg
|
2013-11-03 23:07:03 -08:00 |
|
Dane Springmeyer
|
f1c381e2c6
|
feature_style_processor: remove unused arg
|
2013-11-03 23:07:03 -08:00 |
|
Dane Springmeyer
|
a5f8ba5c6c
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:03 -08:00 |
|
Dane Springmeyer
|
d9bc3dbb81
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
eb1c976bc9
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
ae0a209295
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
a659332284
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
052548d636
|
fix signed/unsigned usage
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
0f8c931530
|
scons: suncc support is not maintained, remove it
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
6ffd0e9bc2
|
map size calculations: be explicit about types
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
1cd7a9228c
|
Merge branch '2.3.x' of https://github.com/mapnik/mapnik into 2.3.x
|
2013-11-03 15:26:50 -08:00 |
|
Dane Springmeyer
|
a656a7af25
|
tests: fix clipping test on windows by stripping newlines
|
2013-11-03 15:23:01 -08:00 |
|
Dane Springmeyer
|
dd5848aff0
|
fix linking on windows - accidentally broken in 8b5323f101 (restores fix from 03d8b6d9d7)
|
2013-11-03 15:22:28 -08:00 |
|
Dane Springmeyer
|
d4befc2706
|
update unifont from 5.1.20080907 to 6.3.20131020 - closes #2061
|
2013-11-01 11:34:26 -07:00 |
|
Dane Springmeyer
|
c1da56a6a0
|
scons: specialize default search path for icu on OS X since homebrew is so common now and icu is 'key-only'
|
2013-10-31 21:14:24 -07:00 |
|
Dane Springmeyer
|
a17006bdd3
|
scons: avoid pollution of global compiler flags from python plugin - closes #2060
|
2013-10-31 13:37:13 -07:00 |
|
Dane Springmeyer
|
8c9c277196
|
travis: use ubuntugis-unstable ppa for more recent gdal and proj4 - refs #2059
|
2013-10-31 12:33:32 -07:00 |
|
Dane Springmeyer
|
6513be924d
|
travis: also install gdal-dev so the gdal and ogr plugins are built and tests are run
|
2013-10-31 11:43:13 -07:00 |
|
Dane Springmeyer
|
6bbd8210f8
|
add more test files - amends 9886d84 - refs #2052
|
2013-10-30 12:00:57 -07:00 |
|
Dane Springmeyer
|
9886d844fe
|
Add a testcase to capture change in src_over compositing - refs #2052 and #1452
|
2013-10-30 11:59:57 -07:00 |
|
Dane Springmeyer
|
7612ff7b20
|
csv plugin: support user defined extent
|
2013-10-30 11:57:03 -07:00 |
|
artemp
|
febf712343
|
Revert "+ std::unordered_map to store properties"
This reverts commit d909c6dede.
|
2013-10-29 14:17:45 +00:00 |
|
artemp
|
3837c68762
|
use non-zero filling rule when rasterising lines
|
2013-10-29 12:26:33 +00:00 |
|
artemp
|
fe1c88f4a5
|
topojson : allow individual geometries not just geometry collections
|
2013-10-29 10:55:13 +00:00 |
|
Dane Springmeyer
|
1f4160f0f0
|
topojson: built up knowledge of attributes and geometry type + tests
|
2013-10-29 00:37:41 -07:00 |
|
Dane Springmeyer
|
44fe776bf5
|
geojson plugin: simplify code
|
2013-10-29 00:34:42 -07:00 |
|
Dane Springmeyer
|
5d7012f32f
|
iwyu
|
2013-10-28 18:46:58 -07:00 |
|
Dane Springmeyer
|
b21b59b835
|
shape.input: conditionally include boost interprocess
|
2013-10-28 18:31:20 -07:00 |
|
Dane Springmeyer
|
0d58a8aee4
|
merge with 2.3.x
|
2013-10-28 14:45:52 -07:00 |
|
Dane Springmeyer
|
a5926e70b2
|
tests: lessen strictness of cairo comparison tests so that files created on ubuntu saucy/os x pass on ubuntu precise - refs #1868
|
2013-10-28 14:18:44 -07:00 |
|
Dane Springmeyer
|
535dc0da3f
|
add #2031 fix to changelog
|
2013-10-28 14:08:33 -07:00 |
|
Dane Springmeyer
|
7a153c44cb
|
tests: stop testing cairo postscript output since it is not important
|
2013-10-28 13:57:34 -07:00 |
|
Dane Springmeyer
|
0978157e92
|
tests: looser tolerance for comparing cairo output sizes
|
2013-10-28 13:56:48 -07:00 |
|
Dane Springmeyer
|
4b55a20cc1
|
Merge branch '2.3.x' of github.com:mapnik/mapnik into 2.3.x
|
2013-10-28 20:40:01 +00:00 |
|
Dane Springmeyer
|
7d9392544d
|
xadd more cairo test files, replace existing via ubuntu saucy
|
2013-10-28 20:39:47 +00:00 |
|
Dane Springmeyer
|
fa6969a561
|
travis: start testing cairo+pycairo+sqlite+postgres
|
2013-10-28 13:19:33 -07:00 |
|
Dane Springmeyer
|
86dfa0778a
|
fix cairo reference counting and add more cairo context tests - closes #2031
|
2013-10-28 12:46:44 -07:00 |
|
artemp
|
c7a989ae83
|
first attempt to re-use generic JSON rules in geojson/topojson parsers
|
2013-10-28 15:57:51 +00:00 |
|
artemp
|
2eaf6a1ead
|
use even/odd polygon filling rule ref https://github.com/mapbox/tilemill/issues/2110
|
2013-10-28 15:57:35 +00:00 |
|
Dane Springmeyer
|
986f47e959
|
remove demo/test files which were moved to tests/python_tests in c84ddc825e - refs #1460
|
2013-10-25 19:01:09 -07:00 |
|
Dane Springmeyer
|
3037fe9ef7
|
readme touchups
|
2013-10-25 17:17:00 -07:00 |
|
Dane Springmeyer
|
9755296091
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
|
2013-10-24 00:00:53 -07:00 |
|
Dane Springmeyer
|
adabe3022d
|
add harfbuzz branch testcases
|
2013-10-23 23:59:14 -07:00 |
|
Dane Springmeyer
|
dcbbcdd8a9
|
make label-position-tolerance a double, as it should have been all along
|
2013-10-23 23:48:24 -07:00 |
|
Dane Springmeyer
|
882ee3cb32
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
|
2013-10-23 21:12:54 -07:00 |
|
Dane Springmeyer
|
2ef7f13d53
|
fix indent
|
2013-10-23 21:12:36 -07:00 |
|
Dane Springmeyer
|
730f8e36e2
|
remove dead code
|
2013-10-23 18:24:35 -07:00 |
|