diff --git a/VisualStudio/examples/osgcluster/osgcluster.dsp b/VisualStudio/examples/osgcluster/osgcluster.dsp index 7328e7680..17bf4d2e6 100644 --- a/VisualStudio/examples/osgcluster/osgcluster.dsp +++ b/VisualStudio/examples/osgcluster/osgcluster.dsp @@ -68,7 +68,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "_CONSOLE" /D "_MBCS" /D "FL_DLL" /D "WIN32" /D "_DEBUG" /YX /FD /Zm200 /c # SUBTRACT CPP /Fr # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" diff --git a/examples/osgmovie/osgmovie.cpp b/examples/osgmovie/osgmovie.cpp index 41a327747..3c67b620e 100644 --- a/examples/osgmovie/osgmovie.cpp +++ b/examples/osgmovie/osgmovie.cpp @@ -205,7 +205,7 @@ osg::Geometry* myCreateTexturedQuadGeometry(const osg::Vec3& pos,float width,flo { if (useTextureRectangle) { - osg::Geometry* pictureQuad = createTexturedQuadGeometry(pos, + osg::Geometry* pictureQuad = osg::createTexturedQuadGeometry(pos, osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,0.0f,height), 0.0f,image->t(), image->s(),0.0f); @@ -218,7 +218,7 @@ osg::Geometry* myCreateTexturedQuadGeometry(const osg::Vec3& pos,float width,flo } else { - osg::Geometry* pictureQuad = createTexturedQuadGeometry(pos, + osg::Geometry* pictureQuad = osg::createTexturedQuadGeometry(pos, osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,0.0f,height), 0.0f,1.0f, 1.0f,0.0f); diff --git a/src/osgPlugins/dxf/scene.h b/src/osgPlugins/dxf/scene.h index 00ec98900..b2fd231c1 100644 --- a/src/osgPlugins/dxf/scene.h +++ b/src/osgPlugins/dxf/scene.h @@ -219,14 +219,15 @@ protected: for (MapVList::iterator mitr = _quads.begin(); mitr != _quads.end(); ++mitr) { osg::Vec3Array *coords = new osg::Vec3Array; - for (VList::iterator itr = mitr->second.begin(); + VList::iterator itr; + for (itr = mitr->second.begin(); itr != mitr->second.end(); ++itr) { osg::Vec3 v(itr->x() - b._min.x(), itr->y() - b._min.y(), itr->z() - b._min.z()); coords->push_back(v); } osg::Vec3Array *norms = new osg::Vec3Array; VList normlist = _quadnorms[mitr->first]; - for (VList::iterator itr = normlist.begin(); + for (itr = normlist.begin(); itr != normlist.end(); ++itr) { norms->push_back(osg::Vec3(itr->x(), itr->y(), itr->z())); } diff --git a/src/osgPlugins/hdr/hdrloader.cpp b/src/osgPlugins/hdr/hdrloader.cpp index 5e1f0ac45..c02875576 100644 --- a/src/osgPlugins/hdr/hdrloader.cpp +++ b/src/osgPlugins/hdr/hdrloader.cpp @@ -157,7 +157,7 @@ void rawRGBEData(RGBE *_scan, int _len, float *_cols) inline float convertComponent(int _expo, int _val) { - return ldexp( static_cast(_val), _expo-8); + return static_cast(ldexp( static_cast(_val), _expo-8)); } void workOnRGBE(RGBE *_scan, int _len, float *_cols)