assorted fixes

diff --git a/progs/tests/Makefile b/progs/tests/Makefile
index 9f1e3cc9eb4c25e2a41defbb71a3144c2a9d6dbf..28f7a50ee645fa3154d8c4d68e4f7f000e168bb8 100644 (file)
--- 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 f7d3ecd38da509b223af5a50f37b4573c7e08333..8e4475316de0d8ccf99c5bf828c57ae46c94d686 100644 (file)
--- 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 509c0433b915d9ab6469ed7620d31d277e640246..acef406097020ea07ec72937b35947a0c60c88b1 100644 (file)
--- 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 494586776a062d66d97566323b1ab77d3b8121a9..3601e7a31c705ad9581e9489860b620510f30cf4 100644 (file)
--- 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")) {