ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed incorrect warnings when reading fonts.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6946 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-12-10 06:20:12 +00:00
parent be7e8793b6
commit d0acfaae3c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/guiengine/scalable_font.cpp
View File

@ -85,7 +85,6 @@ void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
if (core::stringw(L"include") == xml->getNodeName()) if (core::stringw(L"include") == xml->getNodeName())
{ {
core::stringc filename = xml->getAttributeValue(L"file"); core::stringc filename = xml->getAttributeValue(L"file");
// FIXME: need to delete the created XML reader?
io::IXMLReader* included = file_manager->createXMLReader( io::IXMLReader* included = file_manager->createXMLReader(
file_manager->getFontFile(filename.c_str())); file_manager->getFontFile(filename.c_str()));
if (included != NULL) if (included != NULL)
@ -190,13 +189,13 @@ void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
} }
rectangle.LowerRightCorner.Y = val; rectangle.LowerRightCorner.Y = val;
CharacterMap[ch] = Areas.size();
#ifdef DEBUG #ifdef DEBUG
if (CharacterMap.find(ch) != CharacterMap.end()) if (CharacterMap.find(ch) != CharacterMap.end())
{ {
fprintf(stderr, "[ScalableFont] WARNING: Font conflict, two images have character %i\n", (int)ch); fprintf(stderr, "[ScalableFont] WARNING: Font conflict, two images have character %i\n", (int)ch);
} }
#endif #endif
CharacterMap[ch] = Areas.size();
//std::cout << "Inserting character '" << (int)ch << "' with area " << Areas.size() << std::endl; //std::cout << "Inserting character '" << (int)ch << "' with area " << Areas.size() << std::endl;