--- a/test/testdyngl.c Sun Feb 26 04:54:01 2006 +0000
+++ b/test/testdyngl.c Sun Feb 26 05:02:14 2006 +0000
@@ -42,6 +42,7 @@
printf("Unable to get function pointer for %s\n",p);
quit(1);
}
+ return NULL;
}
typedef struct
--- a/test/testgl.c Sun Feb 26 04:54:01 2006 +0000
+++ b/test/testgl.c Sun Feb 26 05:02:14 2006 +0000
@@ -245,8 +245,6 @@
static int w, h;
int x, y;
- SDL_Surface *screen = SDL_GetVideoSurface();
-
if ( ! cursor_texture ) {
SDL_Surface *image;
GLfloat texcoord[4];
@@ -303,7 +301,6 @@
static int w, h;
static int delta_x = 1;
static int delta_y = 1;
- static Uint32 last_moved = 0;
SDL_Surface *screen = SDL_GetVideoSurface();
@@ -377,7 +374,6 @@
static int w, h;
static int delta_x = 1;
static int delta_y = 1;
- static Uint32 last_moved = 0;
SDL_Rect dst;
SDL_Surface *screen = SDL_GetVideoSurface();
@@ -657,7 +653,7 @@
glVertex3fv(cube[2]);
glColor3fv(color[7]);
glVertex3fv(cube[7]);
-#else // flat cube
+#else /* flat cube */
glColor3f(1.0, 0.0, 0.0);
glVertex3fv(cube[0]);
glVertex3fv(cube[1]);
@@ -767,7 +763,7 @@
int main(int argc, char *argv[])
{
- int i, logo, logocursor;
+ int i, logo, logocursor = 0;
int numtests;
int bpp = 0;
int slowly;
--- a/test/testoverlay.c Sun Feb 26 04:54:01 2006 +0000
+++ b/test/testoverlay.c Sun Feb 26 05:02:14 2006 +0000
@@ -34,8 +34,6 @@
void RGBtoYUV(Uint8 *rgb, int *yuv, int monochrome, int luminance)
{
- int i;
-
if (monochrome)
{
#if 1 /* these are the two formulas that I found on the FourCC site... */
@@ -80,7 +78,7 @@
*/
}
-ConvertRGBtoYV12(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoYV12(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
@@ -120,7 +118,7 @@
SDL_UnlockSurface(s);
}
-ConvertRGBtoIYUV(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoIYUV(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
@@ -160,7 +158,7 @@
SDL_UnlockSurface(s);
}
-ConvertRGBtoUYVY(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoUYVY(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
@@ -193,7 +191,7 @@
SDL_UnlockSurface(s);
}
-ConvertRGBtoYVYU(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoYVYU(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
@@ -229,7 +227,7 @@
SDL_UnlockSurface(s);
}
-ConvertRGBtoYUY2(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoYUY2(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
--- a/test/testoverlay2.c Sun Feb 26 04:54:01 2006 +0000
+++ b/test/testoverlay2.c Sun Feb 26 05:02:14 2006 +0000
@@ -57,8 +57,6 @@
void RGBtoYUV(Uint8 *rgb, int *yuv, int monochrome, int luminance)
{
- int i;
-
if (monochrome)
{
#if 1 /* these are the two formulas that I found on the FourCC site... */
@@ -92,7 +90,7 @@
}
}
-ConvertRGBtoYV12(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoYV12(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
@@ -125,7 +123,7 @@
SDL_UnlockSurface(s);
}
-ConvertRGBtoIYUV(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoIYUV(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
@@ -158,7 +156,7 @@
SDL_UnlockSurface(s);
}
-ConvertRGBtoUYVY(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoUYVY(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
@@ -191,7 +189,7 @@
SDL_UnlockSurface(s);
}
-ConvertRGBtoYVYU(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoYVYU(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
@@ -227,7 +225,7 @@
SDL_UnlockSurface(s);
}
-ConvertRGBtoYUY2(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
+void ConvertRGBtoYUY2(SDL_Surface *s, SDL_Overlay *o, int monochrome, int luminance)
{
int x,y;
int yuv[3];
@@ -416,7 +414,7 @@
/* Set video mode */
if ( (screen=SDL_SetVideoMode(MOOSEPIC_W*scale, MOOSEPIC_H*scale, 0, SDL_RESIZABLE | SDL_SWSURFACE)) == NULL )
{
- fprintf(stderr, "Couldn't set video mode: %s\n", 0, SDL_GetError());
+ fprintf(stderr, "Couldn't set video mode: %s\n", SDL_GetError());
free(RawMooseData);
quit(4);
}
@@ -430,7 +428,7 @@
MOOSEPIC_H, 8, MOOSEPIC_W, 0, 0, 0, 0);
if (MooseFrame[i]==NULL)
{
- fprintf(stderr, "Couldn't create SDL_Surfaces:%s\n", 0, SDL_GetError());
+ fprintf(stderr, "Couldn't create SDL_Surfaces:%s\n", SDL_GetError());
free(RawMooseData);
quit(5);
}
--- a/test/testsem.c Sun Feb 26 04:54:01 2006 +0000
+++ b/test/testsem.c Sun Feb 26 05:02:14 2006 +0000
@@ -13,13 +13,6 @@
static SDL_sem *sem;
int alive = 1;
-/* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
-static void quit(int rc)
-{
- SDL_Quit();
- exit(rc);
-}
-
int ThreadFunc(void *data)
{
while ( alive ) {