diff --git a/examples/slideshow3D/SlideEventHandler.h b/examples/slideshow3D/SlideEventHandler.h index 6620dac8d..fe0d30ae8 100644 --- a/examples/slideshow3D/SlideEventHandler.h +++ b/examples/slideshow3D/SlideEventHandler.h @@ -52,7 +52,7 @@ public: bool nextLayer(); bool previousLayer(); - void setAutoSteppingActive(bool flag) { _autoSteppingActive = true; } + void setAutoSteppingActive(bool flag = true) { _autoSteppingActive = flag; } bool getAutoSteppingActive() const { return _autoSteppingActive; } void setTimeDelayBetweenSlides(double dt) { _timePerSlide = dt; } diff --git a/include/osgProducer/KeyboardMouseCallback b/include/osgProducer/KeyboardMouseCallback index f3305fb59..387f2507d 100644 --- a/include/osgProducer/KeyboardMouseCallback +++ b/include/osgProducer/KeyboardMouseCallback @@ -16,6 +16,8 @@ #include +#include // To disable MSVC warnings + #include // For definition of KeySymbol #include diff --git a/include/osgUtil/Statistics b/include/osgUtil/Statistics index 034c24d3d..39f08f34c 100644 --- a/include/osgUtil/Statistics +++ b/include/osgUtil/Statistics @@ -122,10 +122,10 @@ class Statistics : public osg::Drawable::PrimitiveFunctor } virtual void vertex(float,float,float) { vertex(); } virtual void vertex(const osg::Vec3&) { vertex(); } - virtual void vertex(const osg::Vec2& vert) { vertex(); } - virtual void vertex(const osg::Vec4& vert) { vertex(); } - virtual void vertex(float x,float y) { vertex(); } - virtual void vertex(float x,float y,float z,float w) { vertex(); } + virtual void vertex(const osg::Vec2&) { vertex(); } + virtual void vertex(const osg::Vec4&) { vertex(); } + virtual void vertex(float,float) { vertex(); } + virtual void vertex(float,float,float,float) { vertex(); } virtual void end() { diff --git a/src/osgPlugins/flt/flt2osg.cpp b/src/osgPlugins/flt/flt2osg.cpp index 9d7ebddba..7257e1aa2 100644 --- a/src/osgPlugins/flt/flt2osg.cpp +++ b/src/osgPlugins/flt/flt2osg.cpp @@ -1299,7 +1299,7 @@ void ConvertFromFLT::setTexture ( FaceRecord *rec, SFace *pSFace, osg::StateSet //use scale_rgb and scale_alpha of osg::TexEnvCombine to make this effect // Julian Ortiz, June 18th 2003. - flt::AttrData *detailTextureAttrData; + flt::AttrData *detailTextureAttrData = NULL; if (pSFace->iDetailTexturePattern != -1) { int nIndex2 = (int)pSFace->iDetailTexturePattern; detailTextureAttrData = pTexturePool->getTexture(nIndex2,rec->getFlightVersion()); diff --git a/src/osgPlugins/lwo/Lwo2.cpp b/src/osgPlugins/lwo/Lwo2.cpp index 06b3c5605..0eeb9ad02 100644 --- a/src/osgPlugins/lwo/Lwo2.cpp +++ b/src/osgPlugins/lwo/Lwo2.cpp @@ -165,7 +165,7 @@ Lwo2::ReadFile( const string& filename ) unsigned char Lwo2::_read_char() { - char c; + char c = 0; if (_fin.is_open()) { _fin.read(&c, 1); diff --git a/src/osgPlugins/txp/trpage_write.h b/src/osgPlugins/txp/trpage_write.h index 69af3efab..50dd012a4 100644 --- a/src/osgPlugins/txp/trpage_write.h +++ b/src/osgPlugins/txp/trpage_write.h @@ -59,7 +59,7 @@ public: inline void AddStripStat(int val) { stripStat[MIN(14,val)]++; totalStripTri += val; totalTri += val; numStrip++;} inline void AddFanStat(int val) { fanStat[MIN(14,val)]++; totalFanTri += val; totalTri += val; numFan++;} inline void AddBagStat(int val) { totalBagTri += val; totalTri += val;} - inline void AddQuadStat(int val) { totalQuad++; } + inline void AddQuadStat(int val) { totalQuad += val; } }; /* Geometry Helper