From b38a37c3bb53121bedfe7e3887bbfce6459a6227 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 19 Mar 2018 10:42:09 +0000 Subject: [PATCH] Fixed warnings --- examples/osgviewerWX/osgviewerWX.cpp | 2 +- src/osgPlugins/pdf/ReaderWriterPDF.cpp | 2 +- src/osgWrappers/deprecated-dotosg/osg/Texture.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/osgviewerWX/osgviewerWX.cpp b/examples/osgviewerWX/osgviewerWX.cpp index 0afe3469b..9b7ace40e 100644 --- a/examples/osgviewerWX/osgviewerWX.cpp +++ b/examples/osgviewerWX/osgviewerWX.cpp @@ -208,7 +208,7 @@ void OSGCanvas::OnKeyUp(wxKeyEvent &event) // event.Skip() to allow processing to continue. } -void OSGCanvas::OnMouseEnter(wxMouseEvent &event) +void OSGCanvas::OnMouseEnter(wxMouseEvent & /*event*/) { // Set focus to ourselves, so keyboard events get directed to us SetFocus(); diff --git a/src/osgPlugins/pdf/ReaderWriterPDF.cpp b/src/osgPlugins/pdf/ReaderWriterPDF.cpp index 4f09968fa..ed664eb73 100644 --- a/src/osgPlugins/pdf/ReaderWriterPDF.cpp +++ b/src/osgPlugins/pdf/ReaderWriterPDF.cpp @@ -234,7 +234,7 @@ class ReaderWriterPDF : public osgDB::ReaderWriter return readImage(file,options); } - virtual osgDB::ReaderWriter::ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const + virtual osgDB::ReaderWriter::ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options* /*options*/) const { if (!osgDB::equalCaseInsensitive(osgDB::getFileExtension(fileName),"pdf")) { diff --git a/src/osgWrappers/deprecated-dotosg/osg/Texture.cpp b/src/osgWrappers/deprecated-dotosg/osg/Texture.cpp index 0ff49a2d3..bd3469954 100644 --- a/src/osgWrappers/deprecated-dotosg/osg/Texture.cpp +++ b/src/osgWrappers/deprecated-dotosg/osg/Texture.cpp @@ -541,6 +541,7 @@ bool Texture_matchShadowTextureModeStr(const char* str,Texture::ShadowTextureMod if ( strcmp(str,"GL_LUMINANCE")==0) value = Texture::LUMINANCE; else if (strcmp(str,"GL_INTENSITY")==0) value = Texture::INTENSITY; else if (strcmp(str,"GL_ALPHA")==0) value = Texture::ALPHA; + else if (strcmp(str,"GL_NONE")==0) value = Texture::NONE; else return false; return true; @@ -553,6 +554,7 @@ const char* Texture_getShadowTextureModeStr(Texture::ShadowTextureMode value) case( Texture::LUMINANCE ): return "GL_LUMINANCE"; case( Texture::INTENSITY ): return "GL_INTENSITY"; case( Texture::ALPHA ): return "GL_ALPHA"; + case( Texture::NONE ): return "GL_NONE"; } return NULL; }