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

Merge pull request #2466 from mapnik/reduce-compile-times

Browse source 
reduce compile time by minimizing template instantiations
This commit is contained in:
Dane Springmeyer 2014-09-30 10:45:39 -07:00
commit 1452c5b92f
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/marker_helpers.hpp
View file

@ -333,7 +333,7 @@ void apply_markers_multi(feature_impl const& feature, attributes const& vars, Co
std::size_t geom_count = feature.paths().size();
if (geom_count == 1)
{
converter.apply(feature.paths()[0]);
converter.apply(const_cast<geometry_type&>(feature.paths()[0]));
}
else if (geom_count > 1)
{
@ -372,7 +372,7 @@ void apply_markers_multi(feature_impl const& feature, attributes const& vars, Co
}
if (largest)
{
converter.apply(*largest);
converter.apply(const_cast<geometry_type&>(*largest));
}
}
else
@ -383,7 +383,7 @@ void apply_markers_multi(feature_impl const& feature, attributes const& vars, Co
}
for (geometry_type const& path : feature.paths())
{
converter.apply(path);
converter.apply(const_cast<geometry_type&>(path));
}
}
}

7
include/mapnik/vertex_converters.hpp
View file

@ -37,7 +37,7 @@
#include <mapnik/symbolizer_enumerations.hpp>
#include <mapnik/symbolizer_keys.hpp>
#include <mapnik/symbolizer.hpp>
#include <mapnik/geometry.hpp>
// agg
#include "agg_math_stroke.h"
#include "agg_trans_affine.h"
@ -390,10 +390,9 @@ struct vertex_converter : private mapnik::noncopyable
double scale_factor)
: disp_(proc,bbox,sym,tr,prj_trans,affine_trans,feature,vars,scale_factor) {}
template <typename Geometry>
void apply(Geometry & geom)
void apply(geometry_type & geom)
{
detail::converters_helper<dispatcher_type, ConverterTypes...>:: template forward<Geometry>(disp_, geom);
detail::converters_helper<dispatcher_type, ConverterTypes...>:: template forward<geometry_type>(disp_, geom);
}
template <typename Converter>