From bf6f27f6d33cf3ea724331b6534e1ce1192865f0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 5 Feb 2004 11:53:09 +0000 Subject: [PATCH] Changed fonts to lower case. --- src/osgPlugins/txp/TXPArchive.cpp | 6 +++--- src/osgPlugins/txp/TXP_LABELS.README | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/osgPlugins/txp/TXPArchive.cpp b/src/osgPlugins/txp/TXPArchive.cpp index b0ac6b917..6cee9e896 100644 --- a/src/osgPlugins/txp/TXPArchive.cpp +++ b/src/osgPlugins/txp/TXPArchive.cpp @@ -546,7 +546,7 @@ bool TXPArchive::loadTextStyles() std::string line; while (getline(fmapfile,line)) { - int ix = line.find_first_of('='); + unsigned int ix = line.find_first_of('='); if (ix != std::string::npos) { std::string fontname = line.substr(0,ix); @@ -564,7 +564,7 @@ bool TXPArchive::loadTextStyles() else { osg::notify(osg::NOTICE) << "txp:: No font map file found: " << fmapfname << std::endl; - osg::notify(osg::NOTICE) << "txp:: All fonts defaulted to ARIAL.TTF" << std::endl; + osg::notify(osg::NOTICE) << "txp:: All fonts defaulted to arial.ttf" << std::endl; } _fonts.resize(textStyleTable->GetNumStyle()); @@ -578,7 +578,7 @@ bool TXPArchive::loadTextStyles() if (!fontName) continue; std::string fontfilename = fontmap[*fontName]; - if (!fontfilename.length()) fontfilename = "ARIAL.TTF"; + if (!fontfilename.length()) fontfilename = "arial.ttf"; osg::ref_ptr< osgText::Font > font = osgText::readFontFile(fontfilename); _fonts[i] = font; diff --git a/src/osgPlugins/txp/TXP_LABELS.README b/src/osgPlugins/txp/TXP_LABELS.README index 83d6f3f72..15ab448b3 100644 --- a/src/osgPlugins/txp/TXP_LABELS.README +++ b/src/osgPlugins/txp/TXP_LABELS.README @@ -11,7 +11,7 @@ interface to create fonts based on their name (or at least I was not able to fin - it uses the font file name instead Ex: -Times New Roman = TIMES.TTF -Arial = ARIAL.TTF -Arial Narrow = ARIALN.TTF -Courier New = COUR.TTF \ No newline at end of file +Times New Roman = times.ttf +Arial = arial.ttf +Arial Narrow = arian.ttf +Courier New = cour.ttf