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

From Jean-Sebastien Guay, Warning fixes

Browse Source
This commit is contained in:
Robert Osfield 2008-01-08 17:18:11 +00:00
parent d7d1b382b7
commit 6ca573dfd3
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/osgUtil/EdgeCollector
View File

@ -167,16 +167,15 @@ public:
osg::Plane _plane;
};
class OSGUTIL_EXPORT Edgeloop : public osg::Referenced
struct OSGUTIL_EXPORT Edgeloop : public osg::Referenced
{
public:
typedef std::vector<osg::ref_ptr<Edge> > EdgeList;
typedef std::vector<osg::ref_ptr<Edge> > EdgeList;
bool isClosed() { return (_edgeList.back()->endConnected(*_edgeList.front().get())); }
bool isClosed() { return (_edgeList.back()->endConnected(*_edgeList.front().get())); }
osg::UIntArray * toIndexArray() const;
osg::UIntArray * toIndexArray() const;
EdgeList _edgeList;
EdgeList _edgeList;
};

4
src/osgPlugins/freetype/FreeTypeFont.cpp
View File

@ -69,8 +69,8 @@ void FreeTypeFont::setFontResolution(const osgText::FontResolution& fontSize)
int maxAxis = std::max(width, height);
int margin = _facade->getGlyphImageMargin() + (int)((float)maxAxis * _facade->getGlyphImageMarginRatio());
if (width+2*margin>_facade->getTextureWidthHint() ||
width+2*margin>_facade->getTextureHeightHint())
if ((unsigned int)(width+2*margin) > _facade->getTextureWidthHint() ||
(unsigned int)(width+2*margin) > _facade->getTextureHeightHint())
{
osg::notify(osg::WARN)<<"Warning: FreeTypeFont::setSize("<<width<<","<<height<<") sizes too large,"<<std::endl;