Fixed warnings.

This commit is contained in:
Robert Osfield 2004-11-13 21:42:45 +00:00
parent 98a1108696
commit a0fc9632b8
4 changed files with 4 additions and 4 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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
{
}

View File

@ -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;
}