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

make arguments noncopyable

Browse source
This commit is contained in:
artemp 2014-09-29 14:07:39 +01:00
parent e8f7bd0efd
commit 14ba64174b
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/mapnik/vertex_converters.hpp
View file

@ -328,8 +328,10 @@ struct dispatcher : mapnik::noncopyable
using this_type = dispatcher;
using args_type = Args;
dispatcher(args_type const& args)
: args_(args)
dispatcher(typename Args::processor_type & proc, box2d<double> const& bbox, symbolizer_base const& sym, view_transform const& tr,
proj_transform const& prj_trans, agg::trans_affine const& affine_trans, feature_impl const& feature,
attributes const& vars, double scale_factor)
: args_(proc,bbox,sym,tr,prj_trans,affine_trans,feature,vars,scale_factor)
{
std::fill(vec_.begin(), vec_.end(), 0);
}
@ -339,8 +341,9 @@ struct dispatcher : mapnik::noncopyable
};
template <typename Processor>
struct arguments //: mapnik::noncopyable
struct arguments : mapnik::noncopyable
{
using processor_type = Processor;
arguments(Processor & proc, box2d<double> const& bbox, symbolizer_base const& sym, view_transform const& tr,
proj_transform const& prj_trans, agg::trans_affine const& affine_trans, feature_impl const& feature,
attributes const& vars, double scale_factor)
@ -389,7 +392,7 @@ struct vertex_converter : private mapnik::noncopyable
feature_type const& feature,
attributes const& vars,
double scale_factor)
: disp_(args_type(proc,bbox,sym,tr,prj_trans,affine_trans,feature,vars,scale_factor)) {}
: disp_(proc,bbox,sym,tr,prj_trans,affine_trans,feature,vars,scale_factor) {}
template <typename Geometry>
void apply(Geometry & geom)