comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-08 00:44:56 -04:00
Code Issues Projects Releases Wiki Activity

Fix remaining init order and unused warnings

Browse Source
This commit is contained in:
Charles J. Cliffe
2016-01-28 18:11:53 -05:00
parent 18e859b35b
commit c4dac53532
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/GLFont.cpp
+5 -1
View File
@@ -304,12 +304,16 @@ void GLFont::loadFont(std::string fontFile) {
unsigned int imgWidth = imageWidth, imgHeight = imageHeight;
unsigned error = lodepng::decode(image, imgWidth, imgHeight, imageFile);
if (error) {
std::cout << "Error loading PNG image file: '" << imageFile << "'" << std::endl;
}
glGenTextures(1, &texId);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, texId);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexImage2D(GL_TEXTURE_2D, 0, 4, imageWidth, imageHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, &image[0]);
glTexImage2D(GL_TEXTURE_2D, 0, 4, imageWidth, imageHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, error?nullptr:(&image[0]));
glDisable(GL_TEXTURE_2D);
std::map<int, GLFontChar *>::iterator char_i;