diff --git a/src/osgPlugins/dxf/scene.cpp b/src/osgPlugins/dxf/scene.cpp index bf18bc94f..064b1c30d 100644 --- a/src/osgPlugins/dxf/scene.cpp +++ b/src/osgPlugins/dxf/scene.cpp @@ -172,18 +172,18 @@ void scene::addQuads(std::string l, unsigned short color, std::vector 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; } - diff --git a/src/osgPlugins/txp/trpage_managers.cpp b/src/osgPlugins/txp/trpage_managers.cpp index fc626ab1c..8f2c2d9a2 100644 --- a/src/osgPlugins/txp/trpage_managers.cpp +++ b/src/osgPlugins/txp/trpage_managers.cpp @@ -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