artemp
|
58a78e0d9a
|
Merge branch 'MapQuest-jh-min-repeat-distance'
|
2014-08-18 14:05:33 +01:00 |
|
artemp
|
801848ac97
|
Merge branch 'jh-min-repeat-distance' of git://github.com/MapQuest/mapnik into MapQuest-jh-min-repeat-distance
Conflicts:
include/mapnik/renderer_common/process_group_symbolizer.hpp
src/text/text_properties.cpp
|
2014-08-18 14:05:14 +01:00 |
|
artemp
|
0f3b9e020d
|
Merge branch 'mapycz-3.x-fix-compile'
|
2014-08-18 10:27:32 +01:00 |
|
Jiri Drbalek
|
f3fba6e299
|
fix compile with gcc
|
2014-08-17 13:15:56 +00:00 |
|
Dane Springmeyer
|
a4c926ac8a
|
don't throw for OGR layers with no features - refs #2260 #2352 #2354
Conflicts:
tests/python_tests/ogr_test.py
|
2014-08-15 19:49:33 -07:00 |
|
artemp
|
67379d1bba
|
fix icu_shaper
|
2014-08-15 14:11:44 +01:00 |
|
artemp
|
f41b15f967
|
Merge remote-tracking branch 'origin/master'
y this merge is necessary,
|
2014-08-15 11:51:00 +01:00 |
|
Dane Springmeyer
|
751e039347
|
add RESPECT mode to make 'fixing' of bbox aspect a no-op on map
|
2014-08-14 20:27:27 -07:00 |
|
Dane Springmeyer
|
fe8e9a0094
|
remove unneeded Makefile variable [skip ci]
|
2014-08-14 13:40:08 -07:00 |
|
Dane Springmeyer
|
faeb12f5e9
|
tests: fix warnings in pgraster test
|
2014-08-14 12:53:33 -07:00 |
|
Dane Springmeyer
|
9c0f315588
|
clean up icu singletons to avoid valgrind seeing memory leak in hb_shape
|
2014-08-14 12:47:51 -07:00 |
|
Dane Springmeyer
|
8cfb49de81
|
fix quoting in svg output grammars - regressed in 350c2c29bd
|
2014-08-14 12:28:28 -07:00 |
|
Dane Springmeyer
|
595b81107c
|
variant : make operator<< stricter to avoid unexpected instantiations - refs 7602779836
|
2014-08-14 11:50:58 -07:00 |
|
Dane Springmeyer
|
8ef6558496
|
iwyu
|
2014-08-14 10:04:26 -07:00 |
|
artemp
|
52ba1383ec
|
move hash_value into value_adl_barrier namespace where it expected
|
2014-08-14 18:02:52 +01:00 |
|
artemp
|
454a69c582
|
mapnik::value - revive hash_value function implementation (#2358)
|
2014-08-14 10:00:23 +01:00 |
|
Dane Springmeyer
|
b415549823
|
limit benchmarks
|
2014-08-13 17:21:22 -07:00 |
|
Dane Springmeyer
|
5b52fa94b1
|
fix compile on linux
|
2014-08-13 17:21:11 -07:00 |
|
Dane Springmeyer
|
5e314b04a7
|
iwyu
|
2014-08-13 09:05:02 -07:00 |
|
Dane Springmeyer
|
0d47deb169
|
fix pgraster/postgis logic to skip tests if there is no postgres server running
|
2014-08-13 09:04:54 -07:00 |
|
artemp
|
17e1061536
|
Merge branch 'custom-variant-2'
|
2014-08-13 13:11:31 +01:00 |
|
artemp
|
e8b7d50ebb
|
feature_generator_grammar - fix escaping
|
2014-08-13 13:06:38 +01:00 |
|
artemp
|
4ebd824368
|
make to_expression_string accept quotting char (default: '\'')
|
2014-08-13 13:05:22 +01:00 |
|
artemp
|
c8148f780e
|
comment out implicitly_convertible<mapnik::value_bool, mapnik::symbolizer_base::value_type>();
|
2014-08-13 13:04:49 +01:00 |
|
artemp
|
6972bc30d2
|
use mapnik_value_type promotion traits for better type mapping
in symbolizer and params + move mapnik_value_type traits to
value_types.hpp
|
2014-08-13 10:22:43 +01:00 |
|
artemp
|
1d02eb0d1d
|
Merge branch 'master' into custom-variant-2
|
2014-08-13 09:06:58 +01:00 |
|
Dane Springmeyer
|
6ec3905fc5
|
fix redefinition warnings + dodge a compile error due to clashing toupper in python + clib by using iosfwd - closes #2355
|
2014-08-12 23:52:31 -07:00 |
|
Dane Springmeyer
|
5db9daaff1
|
fix compile error in svg_renderer_tests/path_element_test.cpp - refs #2355
|
2014-08-12 23:37:29 -07:00 |
|
Dane Springmeyer
|
522417835b
|
Merge pull request #2354 from kernelsanders/master
add ogr plugin error handling to master/3.x
|
2014-08-12 23:20:27 -07:00 |
|
Dane Springmeyer
|
7da05accc0
|
Merge branch 'master' of github.com:mapnik/mapnik into custom-variant-2
|
2014-08-12 23:19:26 -07:00 |
|
Joel Brown
|
c517b20237
|
add ogr plugin error handling to master/3.x
|
2014-08-12 23:09:42 -07:00 |
|
Dane Springmeyer
|
44844f7bd0
|
postgis: disable NOTICES by default - refs #2296
|
2014-08-12 20:30:34 -07:00 |
|
Dane Springmeyer
|
78258a9459
|
quiet pgraster tests by default
|
2014-08-12 20:30:21 -07:00 |
|
Dane Springmeyer
|
e4c7e2419c
|
make sure pgraster is rebuilt if headers change inside the postgis plugin dir
|
2014-08-12 20:29:51 -07:00 |
|
Dane Springmeyer
|
e03448ecb9
|
port pg_raster plugin to c++11/recent 3.x changes
|
2014-08-12 15:14:25 -07:00 |
|
Dane Springmeyer
|
4e12b999f0
|
pull in pgraster plugin by @strk from 2.3.x to master/3.x - refs #2329 #1660
|
2014-08-12 15:03:51 -07:00 |
|
Dane Springmeyer
|
8b6a0a32f6
|
improve interior position algorithm - patch from @mrwojo - closes #2137
|
2014-08-12 14:42:51 -07:00 |
|
Dane Springmeyer
|
a000df5e46
|
add testcase from #2137
|
2014-08-12 14:33:59 -07:00 |
|
Dane Springmeyer
|
04a9a050a7
|
note png8 default change in master changelog still (no longer 2.3.x) - refs #2110
|
2014-08-12 13:50:56 -07:00 |
|
Dane Springmeyer
|
9b789a398b
|
remove bilinear8 from master/3.x - closes #2076
|
2014-08-12 13:43:37 -07:00 |
|
artemp
|
9f8b88ae4d
|
we do need <iostrea> in non-debug
|
2014-08-12 20:08:52 +01:00 |
|
artemp
|
6136a32092
|
Merge branch 'master' into custom-variant-2
|
2014-08-12 19:44:37 +01:00 |
|
Dane Springmeyer
|
c604e925f5
|
apply #2350 to master/3.x too
|
2014-08-12 11:44:34 -07:00 |
|
Dane Springmeyer
|
072a914906
|
add visual test confirming ttc are read okay - refs #2274
|
2014-08-12 11:34:48 -07:00 |
|
Dane Springmeyer
|
5b3340413b
|
update visual tests after fix in 04e4b47 - refs #2348
|
2014-08-12 11:33:52 -07:00 |
|
Dane Springmeyer
|
04e4b47d91
|
stricter string2bool conversion - refs #2348
|
2014-08-12 11:33:20 -07:00 |
|
Dane Springmeyer
|
3715217b2d
|
Add string2bool test
|
2014-08-12 11:32:34 -07:00 |
|
Dane Springmeyer
|
bd66ead3fd
|
adapt csv tests to boolean change - refs #1540
|
2014-08-12 11:32:02 -07:00 |
|
Dane Springmeyer
|
a13fa6720a
|
csv: parse true/false as boolean in csv plugin - closes #1540
|
2014-08-12 11:16:05 -07:00 |
|
artemp
|
fb2dd283c0
|
fix DEBUG=yes compilation
|
2014-08-12 19:10:32 +01:00 |
|