Dane Springmeyer
3f6a5ae246
re-enable harfbuzz shaper
2014-08-29 00:05:34 -07:00
Dane Springmeyer
b93d0e97e0
remove one more unused function::name that does not compile with msvs 2013 - refs #2396
2014-08-28 18:57:59 -07:00
Dane Springmeyer
37f4c574f3
remove unused function::name that does not compile with msvs 2013 - refs #2396
2014-08-28 18:49:56 -07:00
Dane Springmeyer
3c66054524
Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs
2014-08-28 17:23:59 -07:00
artemp
1ac0ebdd83
rename coord_transform to transform_path_adapter and move implementation into separate header
2014-08-28 10:59:08 +01:00
artemp
ecfaec1027
rename ctrans.hpp to view_transform.hpp
2014-08-28 10:29:04 +01:00
artemp
de22d5900c
rename CoordTransform to view_transform to better reflect its purpose and be consistent
2014-08-28 10:17:15 +01:00
Dane Springmeyer
91da442cdd
fix issue 9 for 2013 CTP from #2396
2014-08-26 20:39:08 -07:00
Dane Springmeyer
ee1c2aec47
use icu shaper to avoid needing to build harfbuzz right now - refs #2396
2014-08-26 19:24:06 -07:00
Dane Springmeyer
5789777199
fix issue 7 from #2396
2014-08-26 19:23:24 -07:00
Dane Springmeyer
c1140fb2ea
fix issue 4 of #2396
2014-08-26 19:01:45 -07:00
Dane Springmeyer
147375e197
workaround issue 3 from #2396
2014-08-26 13:23:48 -07:00
Dane Springmeyer
8d448dad5c
fix issue 2 from #2396
2014-08-26 12:43:31 -07:00
artemp
bfa13152e3
implement unary functions as functors
2014-08-26 11:41:26 +01:00
artemp
4fcbeaf706
avoid creating expression_string(str) visitor objects recursively
2014-08-26 11:00:42 +01:00
artemp
0cfbd3c5e8
expression_string : implement function call support
2014-08-26 10:51:55 +01:00
Dane Springmeyer
8e996e10ab
add support for windows unicode paths in rapidxml loader
...
Conflicts:
src/rapidxml_loader.cpp
2014-08-25 15:43:43 -07:00
artemp
3bd323ca85
expressions - add 'abs' function
2014-08-25 15:13:52 +01:00
artemp
2a254a4017
expressions - refactor function calls into separate compilation unit
2014-08-25 15:06:53 +01:00
artemp
4adb0abb64
expressions - implement unary and binary function expression nodes
...
(sample functions: exp, pow, sin, cos, min, max, tan, atan)
2014-08-25 14:17:18 +01:00
Jiri Drbalek
e1aededb09
refactor marker placements
2014-08-24 18:10:41 +00:00
artemp
eb7716aeed
expressions - initial function_call framework implementation (TODO)
2014-08-22 12:30:25 +01:00
Dane Springmeyer
bb897e0144
use fast path for bbox reprojection (skipping extra point-sampling)
2014-08-20 14:47:27 -07:00
Dane Springmeyer
22117c6c64
code comments to clarify when/why base_path is needed at parse time when loading from a string
2014-08-20 13:53:25 -07:00
Dane Springmeyer
b9060c038c
rapidxml: avoid overhead of stringstream - amends 95d5b73
2014-08-20 13:46:00 -07:00
Dane Springmeyer
65bd9e6926
adapt to ptree change in boost 1.56 - closes #2365
...
Conflicts:
src/save_map.cpp
2014-08-19 09:08:33 -07:00
Dane Springmeyer
41064ed49d
pixel snapping for shields (and points) - closes #1866/refs #1316/amends 2fcd53134
2014-08-18 19:45:21 -07:00
Dane Springmeyer
e94b58f678
load_map: always parse transform so that xml warning keep working
2014-08-18 19:40:34 -07:00
Dane Springmeyer
d6c59d96ec
fix simply option + tests for #1484 and #1992
2014-08-18 19:23:50 -07:00
Dane Springmeyer
5d424e9389
remove unneeded code
2014-08-18 19:19:38 -07: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
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
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
7da05accc0
Merge branch 'master' of github.com:mapnik/mapnik into custom-variant-2
2014-08-12 23:19:26 -07:00
Dane Springmeyer
9b789a398b
remove bilinear8 from master/3.x - closes #2076
2014-08-12 13:43:37 -07:00
artemp
95cea92a4a
convert all boost::variant to util::variant
...
apart from topojson (TODO)
2014-08-12 13:40:45 +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
fe31aed576
fix #2274 in master/3.x
2014-08-11 19:50:50 -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
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
Jordan Hollinger
726274c2c9
Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance
2014-08-11 09:48:04 -04: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
e315922b70
Merge branch 'master' into custom-variant-2
...
Conflicts:
include/mapnik/value.hpp
2014-08-11 11:53:59 +01: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