comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-27 06:08:37 -05:00
Code Issues Projects Releases Wiki Activity

OSX fixes

Browse Source
This commit is contained in:
Charles J. Cliffe 2016-06-12 20:06:44 -04:00
parent 8960d49f84
commit 005ce358ed
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/GLFont.cpp
View File

@ -197,13 +197,13 @@ void GLFont::loadFont(const std::wstring& fontFile) {
std::wifstream input; std::wifstream input;
input.open(fontFileSource.c_str(), std::ios::in); std::string inpFileStr(fontFileSource.begin(), fontFileSource.end());
input.open(inpFileStr, std::ios::in);
std::wstring op; std::wstring op;
while (!input.eof()) { while (!input.eof()) {
input >> op; input >> op;
if (op == L"info") { if (op == L"info") {
std::wstring info_param_str; std::wstring info_param_str;
getline(input, info_param_str); getline(input, info_param_str);
@ -569,8 +569,13 @@ void GLFont::drawString(const std::wstring& str, float xpos, float ypos, int pxH
// Draw string, immediate, 8 bit version // Draw string, immediate, 8 bit version
void GLFont::drawString(const std::string& str, float xpos, float ypos, int pxHeight, Align hAlign, Align vAlign, int vpx, int vpy, bool cacheable) { void GLFont::drawString(const std::string& str, float xpos, float ypos, int pxHeight, Align hAlign, Align vAlign, int vpx, int vpy, bool cacheable) {
//This a thread-safe wsTmp buffer to convert to wstring, reusing the same memory #ifdef WIN32
//This a thread-safe wsTmp buffer to convert to wstring, reusing the same memory, unsupported: OSX?
static thread_local std::wstring wsTmp; static thread_local std::wstring wsTmp;
#else
std::wstring wsTmp;
#endif
wsTmp.clear(); wsTmp.clear();
wsTmp.assign(str.begin(), str.end()); wsTmp.assign(str.begin(), str.end());