FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warning fixes

Browse Source
This commit is contained in:
Robert Osfield
2008-12-17 11:00:16 +00:00
parent e754fc5aab
commit a5c32da4ff
18 changed files with 80 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgText/Font.cpp
View File

@@ -666,9 +666,9 @@ void Font::GlyphTexture::apply(osg::State& state) const
}
if (s_renderer &&
(strstr((const char*)s_renderer,"Radeon")!=0) ||
((strstr((const char*)s_renderer,"Radeon")!=0) ||
(strstr((const char*)s_renderer,"RADEON")!=0) ||
(strstr((const char*)s_renderer,"ALL-IN-WONDER")!=0))
(strstr((const char*)s_renderer,"ALL-IN-WONDER")!=0)))
{
// we're running on an ATI, so need to work around its
// subloading bugs by loading all at once.

6
src/osgText/String.cpp
View File

@@ -304,13 +304,13 @@ std::string String::createUTF8EncodedString() const
else if (currentChar < 0x800)
{
utf8string+=(char)(0xc0 | (currentChar>>6));
utf8string+=(char)(0x80 | currentChar & 0x3f);
utf8string+=(char)(0x80 | (currentChar & 0x3f));
}
else
{
utf8string+=(char)(0xe0 | (currentChar>>12));
utf8string+=(char)(0x80 | (currentChar>>6) & 0x3f);
utf8string+=(char)(0x80 | currentChar & 0x3f);
utf8string+=(char)(0x80 | ((currentChar>>6) & 0x3f));
utf8string+=(char)(0x80 | (currentChar & 0x3f));
}
}
return utf8string;