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

c++ style

Browse source
This commit is contained in:
Dane Springmeyer 2014-09-28 22:20:59 -07:00
parent 758f75dcaa
commit e21e8b6696
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/util/file_io.hpp
View file

@ -40,6 +40,7 @@ class file : public noncopyable
{
public:
using file_ptr = std::unique_ptr<std::FILE, int (*)(std::FILE *)>;
using data_type = std::unique_ptr<char[]>;
explicit file(std::string const& filename)
#ifdef _WINDOWS
@ -72,11 +73,11 @@ public:
return size_;
}
inline std::unique_ptr<char[]> data() const
inline data_type data() const
{
if (!size_) return nullptr;
std::fseek(file_.get(), 0, SEEK_SET);
std::unique_ptr<char[]> buffer(new char[size_]);
data_type buffer(new char[size_]);
std::fread(buffer.get(), size_, 1, file_.get());
return std::move(buffer);
}

6
src/font_engine_freetype.cpp
View file

@ -365,7 +365,7 @@ face_set_ptr face_manager::get_face_set(font_set const& fset)
{
std::vector<std::string> const& names = fset.get_face_names();
face_set_ptr face_set = std::make_shared<font_face_set>();
for (auto const& name : names)
for (auto const& name : names)
{
face_ptr face = get_face(name);
if (face)
@ -384,7 +384,7 @@ face_set_ptr face_manager::get_face_set(font_set const& fset)
return face_set;
}
face_set_ptr face_manager::get_face_set(const std::string &name, boost::optional<font_set> fset)
face_set_ptr face_manager::get_face_set(std::string const& name, boost::optional<font_set> fset)
{
if (fset && fset->size() > 0)
{
@ -400,6 +400,6 @@ face_set_ptr face_manager::get_face_set(const std::string &name, boost::optional
std::mutex freetype_engine::mutex_;
#endif
freetype_engine::font_file_mapping_type freetype_engine::global_font_file_mapping_;
std::map<std::string,std::pair<std::unique_ptr<char[]>,std::size_t> > freetype_engine::global_memory_fonts_;
freetype_engine::font_memory_cache_type freetype_engine::global_memory_fonts_;
}