comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-27 22:14:26 -04:00
Code Issues Projects Releases Wiki Activity

Debian package cpack + icon fix

Browse Source
This commit is contained in:
Charles J. Cliffe
2015-03-08 20:17:19 -04:00
parent 5792256860
commit 07c9395d1f
4 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/GLFont.cpp
+8 -2
View File
@@ -4,6 +4,10 @@
#include <fstream>
#include <algorithm>
#ifndef RES_FOLDER
#define RES_FOLDER ""
#endif
GLFontChar::GLFontChar() :
id(0), x(0), y(0), width(0), height(0), xoffset(0), yoffset(0), xadvance(0), aspect(1), index(0) {
@@ -149,7 +153,8 @@ std::string GLFont::getParamValue(std::string param_str) {
}
void GLFont::loadFont(std::string fontFile) {
fontFileSource = fontFile;
fontFileSource = RES_FOLDER;
fontFileSource.append(fontFile);
std::ifstream input;
input.open(fontFileSource.c_str(), std::ios::in);
@@ -210,7 +215,8 @@ void GLFont::loadFont(std::string fontFile) {
std::string paramValue = getParamValue(param);
if (paramKey == "file") {
imageFile = paramValue;
imageFile = RES_FOLDER;
imageFile.append(paramValue);
}
// std::cout << "[" << paramKey << "] = '" << paramValue << "'" << std::endl;
}