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

From Eric Wing, warning fixes for gcc4.0/OSX.

Browse Source
This commit is contained in:
Robert Osfield
2005-11-22 09:51:02 +00:00
parent 14f943cc32
commit a44f0cf25a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osgPlugins/dxf/scene.cpp
View File

@@ -172,18 +172,18 @@ void scene::addQuads(std::string l, unsigned short color, std::vector<Vec3d> ver
unsigned short
scene::correctedColorIndex(std::string l, unsigned short color)
{
if (color >= aci::MIN && color <= aci::MAX) {
if (color >= aci::MIN && color <= aci::MAX)
{
return color;
} else if (!color || color == aci::BYLAYER) {
}
else if (!color || color == aci::BYLAYER)
{
dxfLayer* layer = _layerTable->findOrCreateLayer(l);
unsigned short lcolor = layer->getColor();
if (lcolor >= aci::MIN && lcolor <= aci::MAX) {
if (lcolor >= aci::MIN && lcolor <= aci::MAX)
{
return lcolor;
} else {
return aci::WHITE;
}
} else {
return aci::WHITE;
}
return aci::WHITE;
}

2
src/osgPlugins/txp/trpage_managers.cpp
View File

@@ -474,7 +474,7 @@ void trpgPageManager::LodPageInfo::Print(trpgPrintBuffer &buf)
current[i]->Print(buf);
buf.DecreaseIndent();
sprintf(line,"Free list size = %d",freeList.size()); buf.prnLine(line);
sprintf(line,"Free list size = %d", (int)freeList.size()); buf.prnLine(line);
}
/* Page Manager methods