From 06a29dabb121b13d92dd1cb57264e97a3470c5f3 Mon Sep 17 00:00:00 2001 From: lucky Date: Sun, 27 Mar 2016 00:56:16 -0700 Subject: [PATCH 1/2] distancefieldfonts: fix SaschaWillems/Vulkan#113 --- distancefieldfonts/distancefieldfonts.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distancefieldfonts/distancefieldfonts.cpp b/distancefieldfonts/distancefieldfonts.cpp index a95d6aff..0c5f2a69 100644 --- a/distancefieldfonts/distancefieldfonts.cpp +++ b/distancefieldfonts/distancefieldfonts.cpp @@ -164,8 +164,8 @@ public: std::stringbuf sbuf((const char*)fileData); std::istream istream(&sbuf); #else - FILE *file = fopen(fileName.c_str(), "r"); - std::filebuf fileBuffer(file); + std::filebuf fileBuffer; + fileBuffer.open(fileName.c_str(), std::ios_base::in); std::istream istream(&fileBuffer); #endif From 0253a419ad47de62f42540f806c80837831a53f4 Mon Sep 17 00:00:00 2001 From: lucky Date: Sun, 27 Mar 2016 01:27:20 -0700 Subject: [PATCH 2/2] use C++11 constructor for filebuf --- distancefieldfonts/distancefieldfonts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distancefieldfonts/distancefieldfonts.cpp b/distancefieldfonts/distancefieldfonts.cpp index 0c5f2a69..a003c09a 100644 --- a/distancefieldfonts/distancefieldfonts.cpp +++ b/distancefieldfonts/distancefieldfonts.cpp @@ -165,7 +165,7 @@ public: std::istream istream(&sbuf); #else std::filebuf fileBuffer; - fileBuffer.open(fileName.c_str(), std::ios_base::in); + fileBuffer.open(fileName, std::ios::in); std::istream istream(&fileBuffer); #endif