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

Taking out unnecessary member variable added in 1a22a19a.

Browse source
This commit is contained in:
Matt Amos 2013-11-29 16:37:20 +00:00
parent 1a22a19a95
commit ca3d66236c
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/cairo_renderer.hpp
View file

@ -147,7 +147,6 @@ protected:
std::shared_ptr<freetype_engine> font_engine_; std::shared_ptr<freetype_engine> font_engine_;
face_manager<freetype_engine> font_manager_; face_manager<freetype_engine> font_manager_;
cairo_face_manager face_manager_; cairo_face_manager face_manager_;
box2d<double> clip_extent_;
std::shared_ptr<label_collision_detector4> detector_; std::shared_ptr<label_collision_detector4> detector_;
box2d<double> query_extent_; box2d<double> query_extent_;
void setup(Map const& m); void setup(Map const& m);

14
src/cairo_renderer.cpp
View file

@ -133,9 +133,9 @@ cairo_renderer_base::cairo_renderer_base(Map const& m,
font_engine_(std::make_shared<freetype_engine>()), font_engine_(std::make_shared<freetype_engine>()),
font_manager_(*font_engine_), font_manager_(*font_engine_),
face_manager_(font_engine_), face_manager_(font_engine_),
clip_extent_(-m.buffer_size(), -m.buffer_size(), detector_(std::make_shared<label_collision_detector4>(
m.width() + m.buffer_size(), m.height() + m.buffer_size()), box2d<double>(-m.buffer_size(), -m.buffer_size(),
detector_(std::make_shared<label_collision_detector4>(clip_extent_)) m.width() + m.buffer_size(), m.height() + m.buffer_size())))
{ {
setup(m); setup(m);
} }
@ -155,9 +155,9 @@ cairo_renderer_base::cairo_renderer_base(Map const& m,
font_engine_(std::make_shared<freetype_engine>()), font_engine_(std::make_shared<freetype_engine>()),
font_manager_(*font_engine_), font_manager_(*font_engine_),
face_manager_(font_engine_), face_manager_(font_engine_),
clip_extent_(-m.buffer_size(), -m.buffer_size(), detector_(std::make_shared<label_collision_detector4>(
m.width() + m.buffer_size(), m.height() + m.buffer_size()), box2d<double>(-m.buffer_size(), -m.buffer_size(),
detector_(std::make_shared<label_collision_detector4>(clip_extent_)) m.width() + m.buffer_size(), m.height() + m.buffer_size())))
{ {
setup(m); setup(m);
} }
@ -177,8 +177,6 @@ cairo_renderer_base::cairo_renderer_base(Map const& m,
font_engine_(std::make_shared<freetype_engine>()), font_engine_(std::make_shared<freetype_engine>()),
font_manager_(*font_engine_), font_manager_(*font_engine_),
face_manager_(font_engine_), face_manager_(font_engine_),
clip_extent_(-m.buffer_size(), -m.buffer_size(),
m.width() + m.buffer_size(), m.height() + m.buffer_size()),
detector_(detector) detector_(detector)
{ {
MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: Scale=" << m.scale(); MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: Scale=" << m.scale();