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

Merge branch 'master' into stdio

Browse source 
Conflicts:
	src/font_engine_freetype.cpp
This commit is contained in:
artemp 2014-06-24 11:42:33 +01:00
commit 11c2aad531
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/font_engine_freetype.cpp
View file

@ -131,12 +131,15 @@ bool freetype_engine::register_font(std::string const& file_name)
bool freetype_engine::register_font_impl(std::string const& file_name, FT_LibraryRec_ * library) bool freetype_engine::register_font_impl(std::string const& file_name, FT_LibraryRec_ * library)
{ {
char buffer[512];
#ifdef _WINDOWS #ifdef _WINDOWS
FILE * file = _wfopen(mapnik::utf8_to_utf16(file_name).c_str(),"rb"); FILE * file = _wfopen(mapnik::utf8_to_utf16(file_name).c_str(),"rb");
#else #else
FILE * file = std::fopen(file_name.c_str(),"rb"); FILE * file = std::fopen(file_name.c_str(),"rb");
#endif #endif
if (file == nullptr) return false; if (file == nullptr) return false;
FT_Face face = 0; FT_Face face = 0;
FT_Open_Args args; FT_Open_Args args;
FT_StreamRec streamRec; FT_StreamRec streamRec;