From a0fc9632b858dd2b767b0b9d4cac6ec0e5943e77 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sat, 13 Nov 2004 21:42:45 +0000
Subject: [PATCH] Fixed warnings.

---
 examples/osglauncher/osglauncher.cpp | 2 +-
 src/osg/Texture.cpp                  | 2 +-
 src/osgGL2/ProgramObject.cpp         | 2 +-
 src/osgProducer/Viewer.cpp           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/osglauncher/osglauncher.cpp b/examples/osglauncher/osglauncher.cpp
index 10144666d..344b14b03 100644
--- a/examples/osglauncher/osglauncher.cpp
+++ b/examples/osglauncher/osglauncher.cpp
@@ -378,7 +378,7 @@ osg::Group* setupGraph()
 
 int main( int argc, char **argv )
 {
-    if (argv[1] == NULL)
+    if (argc<=1)
     {
         std::cout << "Error: First argument missing!" << std::endl << "First argument -> confFile" << std::endl;
         return 0;
diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp
index 00cfa5ce5..082f041e2 100644
--- a/src/osg/Texture.cpp
+++ b/src/osg/Texture.cpp
@@ -606,7 +606,7 @@ bool Texture::isCompressedInternalFormat(GLint internalFormat) const
 
 void Texture::getCompressedSize(GLenum internalFormat, GLint width, GLint height, GLint depth, GLint& blockSize, GLint& size) const
 {
-    if (_internalFormat == GL_COMPRESSED_RGB_S3TC_DXT1_EXT || _internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT)
+    if (internalFormat == GL_COMPRESSED_RGB_S3TC_DXT1_EXT || internalFormat == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT)
         blockSize = 8;
     else
         blockSize = 16;
diff --git a/src/osgGL2/ProgramObject.cpp b/src/osgGL2/ProgramObject.cpp
index 289afd651..d7d756356 100644
--- a/src/osgGL2/ProgramObject.cpp
+++ b/src/osgGL2/ProgramObject.cpp
@@ -208,7 +208,7 @@ int ProgramObject::compare(const osg::StateAttribute& sa) const
 }
 
 
-void ProgramObject::compileGLObjects(osg::State& state) const
+void ProgramObject::compileGLObjects(osg::State&) const
 {
 }
 
diff --git a/src/osgProducer/Viewer.cpp b/src/osgProducer/Viewer.cpp
index 588a22949..8a4be8c0f 100644
--- a/src/osgProducer/Viewer.cpp
+++ b/src/osgProducer/Viewer.cpp
@@ -865,7 +865,7 @@ void Viewer::requestRedraw()
     //osg::notify(osg::INFO)<<"Viewer::requestRedraw() called"<<std::endl;
 }
 
-void Viewer::requestContinuousUpdate(bool flag)
+void Viewer::requestContinuousUpdate(bool)
 {
     //osg::notify(osg::INFO)<<"Viewer::requestContinuousUpdate("<<flag<<") called"<<std::endl;
 }