artemp
8c7be886bd
fix typo - uncomment column_collector
2014-08-12 10:47:29 +01:00
artemp
e5c316ae0b
Merge branch 'master' into custom-variant-2
2014-08-12 10:41:58 +01:00
artemp
3f8c459195
make mapnik::symbolizer a mapnik::util::variant<Symbolizers...>
2014-08-12 10:40:38 +01:00
Dane Springmeyer
f76ea12700
enable other test from #2349
2014-08-11 23:08:17 -07:00
Dane Springmeyer
80aeceafc7
remove duplicate typedef for dash_array
2014-08-11 22:22:12 -07:00
Dane Springmeyer
01c6b42269
Merge pull request #2349 from plepe/allow-overlap-ignore-placement
...
allow-overlap, ignore-placement
2014-08-11 19:54:51 -07:00
Dane Springmeyer
fe31aed576
fix #2274 in master/3.x
2014-08-11 19:50:50 -07:00
Dane Springmeyer
a966929571
add license ref for NotoSans
2014-08-11 19:26:26 -07:00
Dane Springmeyer
19c6e26c5c
tests for ttc support in master/3.x - refs #2274
2014-08-11 19:25:30 -07:00
Jordan Hollinger
c63e3a55f1
Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance
2014-08-11 17:43:51 -04:00
Dane Springmeyer
bbeb9fb631
disable font test until #2341 is fixed [skip ci]
2014-08-11 12:31:24 -07:00
Dane Springmeyer
7a0d316593
update visual tests after fix from 9a1639a1d6
2014-08-11 11:47:11 -07:00
artemp
eabba25948
fix cairo_renderer usage in demo/viewer + revert aac69d0b34
2014-08-11 15:43:38 +01:00
artemp
9a1639a1d6
AGG/Cairo - fix pattern opacity
2014-08-11 15:42:45 +01:00
artemp
201641a206
AGG/Cairo - fix pattern opacity
2014-08-11 15:36:48 +01:00
Stephan Bösch-Plepelits
ec3a2dd08b
Tests for PointSymbolizer.allow-overlap and .ignore-placement with expr
2014-08-11 15:55:38 +02:00
Jordan Hollinger
726274c2c9
Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance
2014-08-11 09:48:04 -04:00
Stephan Bösch-Plepelits
7815d9c6f0
Tests for TextSymbolizer.allow-overlap: true/false/expr
2014-08-11 15:40:52 +02:00
artemp
27ee642bbe
fix cairo_renderer usage in demo/viewer + revert aac69d0b34
2014-08-11 13:40:12 +01:00
artemp
9bfb41a39f
convert symbolizer properties to use util::variant
2014-08-11 13:24:53 +01:00
artemp
aac69d0b34
expose cairo_renderer<cairo_surface_ptr>
2014-08-11 13:24:11 +01:00
artemp
c197822116
add getter interface compatible with boost::variant
2014-08-11 13:23:01 +01:00
artemp
e315922b70
Merge branch 'master' into custom-variant-2
...
Conflicts:
include/mapnik/value.hpp
2014-08-11 11:53:59 +01:00
artemp
43b8069698
topojson - revert to using boost::variant for mapnik::topojson::geometry (TODO)
2014-08-11 11:51:19 +01:00
Dane Springmeyer
4054b97984
fix font testing
2014-08-10 20:56:13 -07:00
Dane Springmeyer
48078da22d
debug font crash - refs #2341
2014-08-10 20:35:23 -07:00
Dane Springmeyer
c285cfa188
refactor cairo_renderer
...
- splits process functions into new cpp files to reduce peak compile memory usage
- drops cairo_renderer_base to match agg_renderer design
- only cairo_ptr is accepted so cairo_surface_ptr must be converted into a context first
- fixes -fvisibility=hidden
2014-08-10 13:53:45 -07:00
Dane Springmeyer
9c7f8284bd
iwyu
2014-08-10 13:52:45 -07:00
Dane Springmeyer
7cae3c34ca
iwyu in renderer_common
2014-08-10 13:04:20 -07:00
Dane Springmeyer
9a1423e669
create cairo context raster than passing surface
2014-08-10 13:03:07 -07:00
Dane Springmeyer
4c10d90145
declare segment y_order inline
2014-08-10 13:02:34 -07:00
Dane Springmeyer
378ab71a51
more -fvisibility=hidden fixes for osx
2014-08-09 14:23:23 -07:00
Dane Springmeyer
b0392ff002
travis: fix benchmark run logic [skip ci]
2014-08-09 14:01:28 -07:00
Dane Springmeyer
678907e027
silence webp -Wunused-function warning
2014-08-09 13:57:01 -07:00
Dane Springmeyer
8ff987af6d
iwyu
2014-08-09 13:46:13 -07:00
Dane Springmeyer
bcc92c9693
Travis: disable notifications + only run bench when built
2014-08-09 13:46:13 -07:00
Dane Springmeyer
1c0b1884c3
use extern template to solve -fvisibility=hidden issues on osx
2014-08-09 13:44:42 -07:00
Dane Springmeyer
52b1da225b
less verbose ifdefs
2014-08-09 13:44:42 -07:00
Dane Springmeyer
d61efc0b5a
-fvisibility=hidden fixes on osx with -flto
2014-08-09 13:44:42 -07:00
Dane Springmeyer
1c9afc9a86
boolean_type cleanup/code re-use
2014-08-09 13:44:41 -07:00
Dane Springmeyer
95430a3beb
remove uneeded debug statement
2014-08-08 15:41:18 -07:00
Dane Springmeyer
4cb7b56f66
remove uneeded logging
2014-08-08 15:01:48 -07:00
Dane Springmeyer
fc70ab6c0a
test a crazy matrix
2014-08-08 15:01:35 -07:00
Dane Springmeyer
578da31702
use extern template to fix osx -flto bug - closes #2339
2014-08-08 14:16:49 -07:00
Dane Springmeyer
1dd0675856
Merge pull request #2347 from mapnik/no-concept-check
...
remove boost concept_check usage - refs #2346
2014-08-08 13:16:26 -07:00
Dane Springmeyer
1727fae6e7
remove boost concept_check usage - refs #2346
2014-08-08 13:15:57 -07:00
Dane Springmeyer
e33e0150ad
2x faster compile of value_types.hpp - start working on #2346
2014-08-08 12:34:41 -07:00
Dane Springmeyer
5a35422ee5
build: remove -finline-functions which is no longer supported by clang-3.5
2014-08-08 12:00:20 -07:00
Dane Springmeyer
471eaed9df
initialize is_geographic
2014-08-08 12:00:20 -07:00
Dane Springmeyer
8f183ac63a
Merge pull request #2345 from mapnik/emplace
...
use emplace/emplace_back over insert/push_back - refs #2336
2014-08-08 11:30:14 -07:00
