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

resolve merge conflict

Browse source
This commit is contained in:
Artem Pavlenko 2012-03-12 16:00:07 +00:00
parent d206657dd4
commit f6f4f27b1f
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/mapnik/symbolizer_helpers.hpp
View file

@ -139,24 +139,11 @@ public:
unsigned width,
unsigned height,
double scale_factor,
<<<<<<< HEAD
CoordTransform const &t,
FaceManagerT &font_manager,
DetectorT &detector,
box2d<double> const& query_extent) :
text_symbolizer_helper<FaceManagerT, DetectorT>(sym, feature, prj_trans, width, height, scale_factor, t, font_manager, detector, query_extent),
||||||| merged common ancestors
CoordTransform const& t,
FaceManagerT & font_manager,
DetectorT & detector) :
text_symbolizer_helper<FaceManagerT, DetectorT>(sym, feature, prj_trans, width, height, scale_factor, t, font_manager, detector),
=======
CoordTransform const &t,
FaceManagerT &font_manager,
DetectorT &detector,
box2d<double> const& query_extent) :
text_symbolizer_helper<FaceManagerT, DetectorT>(sym, feature, prj_trans, width, height, scale_factor, t, font_manager, detector, query_extent),
>>>>>>> master
sym_(sym)
{
this->points_on_line_ = true;