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

font_engine_freetype - remove default constructor and virtual destructor (??).

Browse source
This commit is contained in:
artemp 2017-05-29 10:46:40 +02:00
parent 3b6f3ff36f
commit 4d6a1c5cfc
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/mapnik/font_engine_freetype.hpp
View file

@ -85,14 +85,12 @@ public:
font_file_mapping_type const& global_font_file_mapping, font_file_mapping_type const& global_font_file_mapping,
freetype_engine::font_memory_cache_type & global_memory_fonts); freetype_engine::font_memory_cache_type & global_memory_fonts);
bool register_font_impl(std::string const& file_name, bool register_font_impl(std::string const& file_name,
font_library & libary, font_library & libary,
font_file_mapping_type & font_file_mapping); font_file_mapping_type & font_file_mapping);
bool register_fonts_impl(std::string const& dir, bool register_fonts_impl(std::string const& dir,
font_library & libary, font_library & libary,
font_file_mapping_type & font_file_mapping, font_file_mapping_type & font_file_mapping,
bool recurse = false); bool recurse = false);
virtual ~freetype_engine();
freetype_engine();
private: private:
bool register_font_impl(std::string const& file_name, FT_LibraryRec_ * library); bool register_font_impl(std::string const& file_name, FT_LibraryRec_ * library);
bool register_fonts_impl(std::string const& dir, FT_LibraryRec_ * library, bool recurse = false); bool register_fonts_impl(std::string const& dir, FT_LibraryRec_ * library, bool recurse = false);

3
src/font_engine_freetype.cpp
View file

@ -53,9 +53,6 @@ namespace mapnik
{ {
template class MAPNIK_DECL singleton<freetype_engine, CreateUsingNew>; template class MAPNIK_DECL singleton<freetype_engine, CreateUsingNew>;
freetype_engine::freetype_engine() {}
freetype_engine::~freetype_engine() {}
bool freetype_engine::is_font_file(std::string const& file_name) bool freetype_engine::is_font_file(std::string const& file_name)
{ {
// only accept files that will be matched by freetype2's `figurefiletype()` // only accept files that will be matched by freetype2's `figurefiletype()`