mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

CNeutrinoFonts: performance fix

Browse Source 
Variable '_height' is reassigned a value before the old one has been used.
This commit is contained in:
Thilo Graf
2013-10-10 20:36:25 +02:00
parent 37cb024412
commit b5483d4050
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/neutrinofonts.cpp
View File

@@ -230,13 +230,13 @@ int CNeutrinoFonts::getDynFontSize(int dx, int dy, std::string text, int style)
if (dx == 0) dx = 1280; if (dx == 0) dx = 1280;
while (1) { while (1) {
if (dynFont != NULL) if (dynFont)
delete dynFont; delete dynFont;
dynFont = g_dynFontRenderer->getFont(fontDescr.name.c_str(), dynFontStyle[style].c_str(), dynSize); dynFont = g_dynFontRenderer->getFont(fontDescr.name.c_str(), dynFontStyle[style].c_str(), dynSize);
int _width = 0;
int _height = 0;
// calculate height & width // calculate height & width
_height = getFontHeight(dynFont); int _width = 0;
int _height = getFontHeight(dynFont);;
std::string tmpText = text; std::string tmpText = text;
if (text == "") tmpText = "x"; if (text == "") tmpText = "x";
_width = dynFont->getRenderWidth(tmpText.c_str()); _width = dynFont->getRenderWidth(tmpText.c_str());
@@ -255,7 +255,7 @@ int CNeutrinoFonts::getDynFontSize(int dx, int dy, std::string text, int style)
break; break;
} }
if (dynFont != NULL) if (dynFont)
delete dynFont; delete dynFont;
return dynSize; return dynSize;