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

Fixes for VS6.0 build

Browse Source
This commit is contained in:
Robert Osfield 2005-04-04 12:24:18 +00:00
parent 2e32a7cb78
commit 816df3a1d0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/osgPlugins/net/sockstream.h
View File

@ -49,6 +49,7 @@
#else
# include <windows.h>
# include <Wininet.h>
//# include <errno.h>
#ifdef _MSC_VER
# pragma comment(lib, "Wininet")
#endif

9
src/osgPlugins/osg/ProxyNode.cpp
View File

@ -100,16 +100,17 @@ bool ProxyNode_readLocalData(Object& obj, Input& fr)
}
int num_children;
unsigned int num_children;
if (fr[0].matchWord("num_children") &&
fr[1].getInt(num_children))
fr[1].getUInt(num_children))
{
// could allocate space for children here...
fr+=2;
iteratorAdvanced = true;
}
for(int i=0; i<num_children; i++)
unsigned int i;
for(i=0; i<num_children; i++)
{
osgDB::FilePathList& fpl = ((osgDB::ReaderWriter::Options*)fr.getOptions())->getDatabasePathList();
fpl.push_front( fpl.empty() ? osgDB::getFilePath(proxyNode.getFileName(i)) : fpl.front()+'/'+ osgDB::getFilePath(proxyNode.getFileName(i)));
@ -122,7 +123,7 @@ bool ProxyNode_readLocalData(Object& obj, Input& fr)
fpl.pop_front();
}
for(unsigned int i=0; i<proxyNode.getNumFileNames(); i++)
for(i=0; i<proxyNode.getNumFileNames(); i++)
{
if(i>=proxyNode.getNumChildren() && !proxyNode.getFileName(i).empty())
{

5
src/osgText/Text.cpp
View File

@ -566,7 +566,8 @@ void Text::computeGlyphRepresentation()
// osg::notify(osg::NOTICE)<<"lineNumber="<<lineNumber<<std::endl;
for(TextureGlyphQuadMap::const_iterator titr=_textureGlyphQuadMap.begin();
TextureGlyphQuadMap::iterator titr;
for(titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end();
++titr)
{
@ -646,7 +647,7 @@ void Text::computeGlyphRepresentation()
}
// shift lines
for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin();
for(titr=_textureGlyphQuadMap.begin();
titr!=_textureGlyphQuadMap.end();
++titr)
{