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

remove reference on template parameter Detector

Browse source
This commit is contained in:
Mickey Rose 2016-03-03 00:17:41 +01:00
parent c8e3a0d549
commit 489631ca34
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/marker_helpers.hpp
View file

@ -172,8 +172,8 @@ void apply_markers_multi(feature_impl const& feature, attributes const& vars,
vertex_converter_type & converter, Processor & proc, symbolizer_base const& sym); vertex_converter_type & converter, Processor & proc, symbolizer_base const& sym);
using vector_dispatch_type = vector_markers_dispatch<mapnik::label_collision_detector4&>; using vector_dispatch_type = vector_markers_dispatch<mapnik::label_collision_detector4>;
using raster_dispatch_type = raster_markers_dispatch<mapnik::label_collision_detector4&>; using raster_dispatch_type = raster_markers_dispatch<mapnik::label_collision_detector4>;
extern template void apply_markers_multi<vector_dispatch_type>(feature_impl const& feature, attributes const& vars, extern template void apply_markers_multi<vector_dispatch_type>(feature_impl const& feature, attributes const& vars,
vertex_converter_type & converter, vector_dispatch_type & proc, symbolizer_base const& sym); vertex_converter_type & converter, vector_dispatch_type & proc, symbolizer_base const& sym);

2
src/renderer_common/render_markers_symbolizer.cpp
View file

@ -245,7 +245,7 @@ void render_markers_symbolizer(markers_symbolizer const& sym,
box2d<double> const& clip_box, box2d<double> const& clip_box,
markers_renderer_context & renderer_context) markers_renderer_context & renderer_context)
{ {
using Detector = decltype(*common.detector_); using Detector = label_collision_detector4;
using RendererType = renderer_common; using RendererType = renderer_common;
using ContextType = markers_renderer_context; using ContextType = markers_renderer_context;
using VisitorType = detail::render_marker_symbolizer_visitor<Detector, using VisitorType = detail::render_marker_symbolizer_visitor<Detector,