sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update svg_renderer

Browse source
This commit is contained in:
Dane Springmeyer 2012-12-17 19:13:00 -08:00
parent 8d2b00ea75
commit c7ed1f93d7
2 changed files with 32 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/svg/output/svg_renderer.hpp
View file

@ -104,6 +104,11 @@ public:
// nothing to do // nothing to do
} }
inline eAttributeCollectionPolicy attribute_collection_policy() const
{
return DEFAULT;
}
inline OutputIterator& get_output_iterator() inline OutputIterator& get_output_iterator()
{ {
return output_iterator_; return output_iterator_;

66
src/build.py
View file

@ -202,45 +202,6 @@ if env['HAS_CAIRO']:
libmapnik_cxxflags.append('-DHAVE_CAIRO') libmapnik_cxxflags.append('-DHAVE_CAIRO')
lib_env.PrependUnique(CPPPATH=copy(env['CAIROMM_CPPPATHS'])) lib_env.PrependUnique(CPPPATH=copy(env['CAIROMM_CPPPATHS']))
source.insert(0,'cairo_renderer.cpp') source.insert(0,'cairo_renderer.cpp')
#cairo_env.PrependUnique(CPPPATH=env['CAIROMM_CPPPATHS'])
# not safe, to much depends on graphics.hpp
#cairo_env = lib_env.Clone()
#cairo_env.Append(CXXFLAGS = '-DHAVE_CAIRO')
#fixup = ['feature_type_style.cpp','load_map.cpp','cairo_renderer.cpp','graphics.cpp','image_util.cpp']
#for cpp in fixup:
# if cpp in source:
# source.remove(cpp)
# if env['LINKING'] == 'static':
# source.insert(0,cairo_env.StaticObject(cpp))
# else:
# source.insert(0,cairo_env.SharedObject(cpp))
processor_cpp = 'feature_style_processor.cpp'
if env['RENDERING_STATS']:
env3 = lib_env.Clone()
env3.Append(CXXFLAGS='-DRENDERING_STATS')
if env['LINKING'] == 'static':
source.insert(0,env3.StaticObject(processor_cpp))
else:
source.insert(0,env3.SharedObject(processor_cpp))
else:
source.insert(0,processor_cpp);
if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1])
if boost_version_from_header < 46:
# avoid ubuntu issue with boost interprocess:
# https://github.com/mapnik/mapnik/issues/1001
env4 = lib_env.Clone()
env4.Append(CXXFLAGS = '-fpermissive')
cpp ='mapped_memory_cache.cpp'
source.remove(cpp)
if env['LINKING'] == 'static':
source.insert(0,env4.StaticObject(cpp))
else:
source.insert(0,env4.SharedObject(cpp))
if env['JPEG']: if env['JPEG']:
source += Split( source += Split(
@ -308,6 +269,21 @@ if env['SVG_RENDERER']: # svg backend
lib_env.Append(CXXFLAGS = '-DSVG_RENDERER') lib_env.Append(CXXFLAGS = '-DSVG_RENDERER')
libmapnik_cxxflags.append('-DSVG_RENDERER') libmapnik_cxxflags.append('-DSVG_RENDERER')
if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1])
if boost_version_from_header < 46:
# avoid ubuntu issue with boost interprocess:
# https://github.com/mapnik/mapnik/issues/1001
env4 = lib_env.Clone()
env4.Append(CXXFLAGS = '-fpermissive')
cpp ='mapped_memory_cache.cpp'
source.remove(cpp)
if env['LINKING'] == 'static':
source.insert(0,env4.StaticObject(cpp))
else:
source.insert(0,env4.SharedObject(cpp))
if env['XMLPARSER'] == 'libxml2' and env['HAS_LIBXML2']: if env['XMLPARSER'] == 'libxml2' and env['HAS_LIBXML2']:
source += Split( source += Split(
""" """
@ -331,6 +307,18 @@ else:
""" """
) )
processor_cpp = 'feature_style_processor.cpp'
if env['RENDERING_STATS']:
env3 = lib_env.Clone()
env3.Append(CXXFLAGS='-DRENDERING_STATS')
if env['LINKING'] == 'static':
source.insert(0,env3.StaticObject(processor_cpp))
else:
source.insert(0,env3.SharedObject(processor_cpp))
else:
source.insert(0,processor_cpp);
if env['CUSTOM_LDFLAGS']: if env['CUSTOM_LDFLAGS']:
linkflags = '%s %s' % (env['CUSTOM_LDFLAGS'], mapnik_lib_link_flag) linkflags = '%s %s' % (env['CUSTOM_LDFLAGS'], mapnik_lib_link_flag)
else: else: