diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-23 14:14:04 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-23 14:14:04 +0000 |
commit | 384800fe12e368f3489111de4572dbc8846a7dea (patch) | |
tree | 133f41cce9be28939cba5541cc4447d62ac792b4 | |
parent | 180e28e6d49ea0c4cdfbf7b80c4ce26c67574d9a (diff) |
assorted fixes
-rw-r--r-- | progs/tests/Makefile | 1 | ||||
-rw-r--r-- | progs/tests/stencilwrap.c | 2 | ||||
-rw-r--r-- | progs/tests/yuvrect.c | 1 | ||||
-rw-r--r-- | progs/tests/yuvsquare.c | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/progs/tests/Makefile b/progs/tests/Makefile index 9f1e3cc9eb..28f7a50ee6 100644 --- a/progs/tests/Makefile +++ b/progs/tests/Makefile @@ -34,7 +34,6 @@ SOURCES = antialias.c \ seccolor.c \ sharedtex.c \ stencilwrap.c \ - swaplock.c \ tex1d.c \ texline.c \ texrect.c \ diff --git a/progs/tests/stencilwrap.c b/progs/tests/stencilwrap.c index f7d3ecd38d..8e4475316d 100644 --- a/progs/tests/stencilwrap.c +++ b/progs/tests/stencilwrap.c @@ -164,7 +164,7 @@ static void Init( void ) */ ver_str = glGetString( GL_VERSION ); - version = (ver_str == NULL) ? 1.0 : strtof( ver_str, NULL ); + version = (ver_str == NULL) ? 1.0 : atof( ver_str ); if ( !glutExtensionSupported("GL_EXT_stencil_wrap") && (version < 1.4) ) { diff --git a/progs/tests/yuvrect.c b/progs/tests/yuvrect.c index 509c0433b9..acef406097 100644 --- a/progs/tests/yuvrect.c +++ b/progs/tests/yuvrect.c @@ -18,7 +18,6 @@ static GLfloat Xrot = 0, Yrot = 0, Zrot = 0; static GLint ImgWidth, ImgHeight; -static GLenum ImgFormat; static GLushort *ImageYUV = NULL; diff --git a/progs/tests/yuvsquare.c b/progs/tests/yuvsquare.c index 494586776a..3601e7a31c 100644 --- a/progs/tests/yuvsquare.c +++ b/progs/tests/yuvsquare.c @@ -128,7 +128,6 @@ static void SpecialKey( int key, int x, int y ) static void Init( int argc, char *argv[] ) { const char *file; - int error; GLenum format; if (!glutExtensionSupported("GL_MESA_ycbcr_texture")) { |