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

+ remove unused font_manager_

Browse source
This commit is contained in:
artemp 2012-07-02 13:28:40 +01:00
parent 757816a1b8
commit 7d2c695849
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/cairo_renderer.hpp
View file

@ -60,14 +60,12 @@ typedef boost::shared_ptr<cairo_face> cairo_face_ptr;
class cairo_face_manager : private boost::noncopyable
{
public:
cairo_face_manager(boost::shared_ptr<freetype_engine> engine,
face_manager<freetype_engine> & manager);
cairo_face_manager(boost::shared_ptr<freetype_engine> engine);
cairo_face_ptr get_face(face_ptr face);
private:
typedef std::map<face_ptr,cairo_face_ptr> cairo_face_cache;
boost::shared_ptr<freetype_engine> font_engine_;
face_manager<freetype_engine> & font_manager_;
cairo_face_cache cache_;
};

8
src/cairo_renderer.cpp
View file

@ -238,10 +238,8 @@ private:
Cairo::RefPtr<Cairo::FontFace> cairo_face_;
};
cairo_face_manager::cairo_face_manager(boost::shared_ptr<freetype_engine> engine,
face_manager<freetype_engine> & manager)
: font_engine_(engine),
font_manager_(manager)
cairo_face_manager::cairo_face_manager(boost::shared_ptr<freetype_engine> engine)
: font_engine_(engine)
{
}
@ -745,7 +743,7 @@ cairo_renderer_base::cairo_renderer_base(Map const& m, Cairo::RefPtr<Cairo::Cont
t_(m.width(),m.height(),m.get_current_extent(),offset_x,offset_y),
font_engine_(boost::make_shared<freetype_engine>()),
font_manager_(*font_engine_),
face_manager_(font_engine_,font_manager_),
face_manager_(font_engine_),
detector_(box2d<double>(-m.buffer_size() ,-m.buffer_size() , m.width() + m.buffer_size() ,m.height() + m.buffer_size()))
{
MAPNIK_LOG_DEBUG(cairo_renderer) << "cairo_renderer_base: Scale=" << m.scale();