--- a/test/testoverlay.c	Mon May 29 03:53:21 2006 +0000
+++ b/test/testoverlay.c	Mon May 29 04:04:35 2006 +0000
@@ -23,10 +23,10 @@
 
 /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
 static void
-quit (int rc)
+quit(int rc)
 {
-    SDL_Quit ();
-    exit (rc);
+    SDL_Quit();
+    exit(rc);
 }
 
 /* NOTE: These RGB conversion functions are not intended for speed,
@@ -34,7 +34,7 @@
 */
 
 void
-RGBtoYUV (Uint8 * rgb, int *yuv, int monochrome, int luminance)
+RGBtoYUV(Uint8 * rgb, int *yuv, int monochrome, int luminance)
 {
     if (monochrome) {
 #if 1                           /* these are the two formulas that I found on the FourCC site... */
@@ -77,15 +77,15 @@
 }
 
 void
-ConvertRGBtoYV12 (SDL_Surface * s, SDL_Overlay * o, int monochrome,
-                  int luminance)
+ConvertRGBtoYV12(SDL_Surface * s, SDL_Overlay * o, int monochrome,
+                 int luminance)
 {
     int x, y;
     int yuv[3];
     Uint8 *p, *op[3];
 
-    SDL_LockSurface (s);
-    SDL_LockYUVOverlay (o);
+    SDL_LockSurface(s);
+    SDL_LockYUVOverlay(o);
 
     /* Black initialization */
     /*
@@ -101,7 +101,7 @@
         op[1] = o->pixels[1] + o->pitches[1] * (y / 2);
         op[2] = o->pixels[2] + o->pitches[2] * (y / 2);
         for (x = 0; x < s->w && x < o->w; x++) {
-            RGBtoYUV (p, yuv, monochrome, luminance);
+            RGBtoYUV(p, yuv, monochrome, luminance);
             *(op[0]++) = yuv[0];
             if (x % 2 == 0 && y % 2 == 0) {
                 *(op[1]++) = yuv[2];
@@ -111,20 +111,20 @@
         }
     }
 
-    SDL_UnlockYUVOverlay (o);
-    SDL_UnlockSurface (s);
+    SDL_UnlockYUVOverlay(o);
+    SDL_UnlockSurface(s);
 }
 
 void
-ConvertRGBtoIYUV (SDL_Surface * s, SDL_Overlay * o, int monochrome,
-                  int luminance)
+ConvertRGBtoIYUV(SDL_Surface * s, SDL_Overlay * o, int monochrome,
+                 int luminance)
 {
     int x, y;
     int yuv[3];
     Uint8 *p, *op[3];
 
-    SDL_LockSurface (s);
-    SDL_LockYUVOverlay (o);
+    SDL_LockSurface(s);
+    SDL_LockYUVOverlay(o);
 
     /* Black initialization */
     /*
@@ -140,7 +140,7 @@
         op[1] = o->pixels[1] + o->pitches[1] * (y / 2);
         op[2] = o->pixels[2] + o->pitches[2] * (y / 2);
         for (x = 0; x < s->w && x < o->w; x++) {
-            RGBtoYUV (p, yuv, monochrome, luminance);
+            RGBtoYUV(p, yuv, monochrome, luminance);
             *(op[0]++) = yuv[0];
             if (x % 2 == 0 && y % 2 == 0) {
                 *(op[1]++) = yuv[1];
@@ -150,26 +150,26 @@
         }
     }
 
-    SDL_UnlockYUVOverlay (o);
-    SDL_UnlockSurface (s);
+    SDL_UnlockYUVOverlay(o);
+    SDL_UnlockSurface(s);
 }
 
 void
-ConvertRGBtoUYVY (SDL_Surface * s, SDL_Overlay * o, int monochrome,
-                  int luminance)
+ConvertRGBtoUYVY(SDL_Surface * s, SDL_Overlay * o, int monochrome,
+                 int luminance)
 {
     int x, y;
     int yuv[3];
     Uint8 *p, *op;
 
-    SDL_LockSurface (s);
-    SDL_LockYUVOverlay (o);
+    SDL_LockSurface(s);
+    SDL_LockYUVOverlay(o);
 
     for (y = 0; y < s->h && y < o->h; y++) {
         p = ((Uint8 *) s->pixels) + s->pitch * y;
         op = o->pixels[0] + o->pitches[0] * y;
         for (x = 0; x < s->w && x < o->w; x++) {
-            RGBtoYUV (p, yuv, monochrome, luminance);
+            RGBtoYUV(p, yuv, monochrome, luminance);
             if (x % 2 == 0) {
                 *(op++) = yuv[1];
                 *(op++) = yuv[0];
@@ -181,26 +181,26 @@
         }
     }
 
-    SDL_UnlockYUVOverlay (o);
-    SDL_UnlockSurface (s);
+    SDL_UnlockYUVOverlay(o);
+    SDL_UnlockSurface(s);
 }
 
 void
-ConvertRGBtoYVYU (SDL_Surface * s, SDL_Overlay * o, int monochrome,
-                  int luminance)
+ConvertRGBtoYVYU(SDL_Surface * s, SDL_Overlay * o, int monochrome,
+                 int luminance)
 {
     int x, y;
     int yuv[3];
     Uint8 *p, *op;
 
-    SDL_LockSurface (s);
-    SDL_LockYUVOverlay (o);
+    SDL_LockSurface(s);
+    SDL_LockYUVOverlay(o);
 
     for (y = 0; y < s->h && y < o->h; y++) {
         p = ((Uint8 *) s->pixels) + s->pitch * y;
         op = o->pixels[0] + o->pitches[0] * y;
         for (x = 0; x < s->w && x < o->w; x++) {
-            RGBtoYUV (p, yuv, monochrome, luminance);
+            RGBtoYUV(p, yuv, monochrome, luminance);
             if (x % 2 == 0) {
                 *(op++) = yuv[0];
                 *(op++) = yuv[2];
@@ -214,26 +214,26 @@
         }
     }
 
-    SDL_UnlockYUVOverlay (o);
-    SDL_UnlockSurface (s);
+    SDL_UnlockYUVOverlay(o);
+    SDL_UnlockSurface(s);
 }
 
 void
-ConvertRGBtoYUY2 (SDL_Surface * s, SDL_Overlay * o, int monochrome,
-                  int luminance)
+ConvertRGBtoYUY2(SDL_Surface * s, SDL_Overlay * o, int monochrome,
+                 int luminance)
 {
     int x, y;
     int yuv[3];
     Uint8 *p, *op;
 
-    SDL_LockSurface (s);
-    SDL_LockYUVOverlay (o);
+    SDL_LockSurface(s);
+    SDL_LockYUVOverlay(o);
 
     for (y = 0; y < s->h && y < o->h; y++) {
         p = ((Uint8 *) s->pixels) + s->pitch * y;
         op = o->pixels[0] + o->pitches[0] * y;
         for (x = 0; x < s->w && x < o->w; x++) {
-            RGBtoYUV (p, yuv, monochrome, luminance);
+            RGBtoYUV(p, yuv, monochrome, luminance);
             if (x % 2 == 0) {
                 *(op++) = yuv[0];
                 *(op++) = yuv[1];
@@ -247,12 +247,12 @@
         }
     }
 
-    SDL_UnlockYUVOverlay (o);
-    SDL_UnlockSurface (s);
+    SDL_UnlockYUVOverlay(o);
+    SDL_UnlockSurface(s);
 }
 
 void
-Draw ()
+Draw()
 {
     SDL_Rect rect;
     int i;
@@ -264,7 +264,7 @@
         for (i = 0; i < h - rect.h && i < w - rect.w; i++) {
             rect.x = i;
             rect.y = i;
-            SDL_DisplayYUVOverlay (overlay, &rect);
+            SDL_DisplayYUVOverlay(overlay, &rect);
         }
     } else {
         rect.w = overlay->w / 2;
@@ -277,38 +277,38 @@
             rect.h += 2;
             rect.x--;
             rect.y--;
-            SDL_DisplayYUVOverlay (overlay, &rect);
+            SDL_DisplayYUVOverlay(overlay, &rect);
         }
     }
-    printf ("Displayed %d times.\n", i);
+    printf("Displayed %d times.\n", i);
 }
 
 static void
-PrintUsage (char *argv0)
+PrintUsage(char *argv0)
 {
-    fprintf (stderr, "Usage: %s [arg] [arg] [arg] ...\n", argv0);
-    fprintf (stderr, "Where 'arg' is one of:\n");
-    fprintf (stderr, "	-delay <seconds>\n");
-    fprintf (stderr, "	-width <pixels>\n");
-    fprintf (stderr, "	-height <pixels>\n");
-    fprintf (stderr, "	-bpp <bits>\n");
-    fprintf (stderr,
-             "	-format <fmt> (one of the: YV12, IYUV, YUY2, UYVY, YVYU)\n");
-    fprintf (stderr, "	-hw\n");
-    fprintf (stderr, "	-flip\n");
-    fprintf (stderr,
-             "	-scale (test scaling features, from 50%% upto window size)\n");
-    fprintf (stderr, "	-mono (use monochromatic RGB2YUV conversion)\n");
-    fprintf (stderr,
-             "	-lum <perc> (use luminance correction during RGB2YUV conversion,\n");
-    fprintf (stderr,
-             "	             from 0%% to unlimited, normal is 100%%)\n");
-    fprintf (stderr, "	-help (shows this help)\n");
-    fprintf (stderr, "	-fullscreen (test overlay in fullscreen mode)\n");
+    fprintf(stderr, "Usage: %s [arg] [arg] [arg] ...\n", argv0);
+    fprintf(stderr, "Where 'arg' is one of:\n");
+    fprintf(stderr, "	-delay <seconds>\n");
+    fprintf(stderr, "	-width <pixels>\n");
+    fprintf(stderr, "	-height <pixels>\n");
+    fprintf(stderr, "	-bpp <bits>\n");
+    fprintf(stderr,
+            "	-format <fmt> (one of the: YV12, IYUV, YUY2, UYVY, YVYU)\n");
+    fprintf(stderr, "	-hw\n");
+    fprintf(stderr, "	-flip\n");
+    fprintf(stderr,
+            "	-scale (test scaling features, from 50%% upto window size)\n");
+    fprintf(stderr, "	-mono (use monochromatic RGB2YUV conversion)\n");
+    fprintf(stderr,
+            "	-lum <perc> (use luminance correction during RGB2YUV conversion,\n");
+    fprintf(stderr,
+            "	             from 0%% to unlimited, normal is 100%%)\n");
+    fprintf(stderr, "	-help (shows this help)\n");
+    fprintf(stderr, "	-fullscreen (test overlay in fullscreen mode)\n");
 }
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
     char *argv0 = argv[0];
     int flip;
@@ -334,131 +334,131 @@
     overlay_format = SDL_YV12_OVERLAY;
 
     while (argc > 1) {
-        if (strcmp (argv[1], "-delay") == 0) {
+        if (strcmp(argv[1], "-delay") == 0) {
             if (argv[2]) {
-                delay = atoi (argv[2]);
+                delay = atoi(argv[2]);
                 argv += 2;
                 argc -= 2;
             } else {
-                fprintf (stderr, "The -delay option requires an argument\n");
+                fprintf(stderr, "The -delay option requires an argument\n");
                 return (1);
             }
-        } else if (strcmp (argv[1], "-width") == 0) {
-            if (argv[2] && ((w = atoi (argv[2])) > 0)) {
+        } else if (strcmp(argv[1], "-width") == 0) {
+            if (argv[2] && ((w = atoi(argv[2])) > 0)) {
                 argv += 2;
                 argc -= 2;
             } else {
-                fprintf (stderr, "The -width option requires an argument\n");
+                fprintf(stderr, "The -width option requires an argument\n");
                 return (1);
             }
-        } else if (strcmp (argv[1], "-height") == 0) {
-            if (argv[2] && ((h = atoi (argv[2])) > 0)) {
+        } else if (strcmp(argv[1], "-height") == 0) {
+            if (argv[2] && ((h = atoi(argv[2])) > 0)) {
                 argv += 2;
                 argc -= 2;
             } else {
-                fprintf (stderr, "The -height option requires an argument\n");
+                fprintf(stderr, "The -height option requires an argument\n");
                 return (1);
             }
-        } else if (strcmp (argv[1], "-bpp") == 0) {
+        } else if (strcmp(argv[1], "-bpp") == 0) {
             if (argv[2]) {
-                desired_bpp = atoi (argv[2]);
+                desired_bpp = atoi(argv[2]);
                 argv += 2;
                 argc -= 2;
             } else {
-                fprintf (stderr, "The -bpp option requires an argument\n");
+                fprintf(stderr, "The -bpp option requires an argument\n");
                 return (1);
             }
-        } else if (strcmp (argv[1], "-lum") == 0) {
+        } else if (strcmp(argv[1], "-lum") == 0) {
             if (argv[2]) {
-                luminance = atoi (argv[2]);
+                luminance = atoi(argv[2]);
                 argv += 2;
                 argc -= 2;
             } else {
-                fprintf (stderr, "The -lum option requires an argument\n");
+                fprintf(stderr, "The -lum option requires an argument\n");
                 return (1);
             }
-        } else if (strcmp (argv[1], "-format") == 0) {
+        } else if (strcmp(argv[1], "-format") == 0) {
             if (argv[2]) {
-                if (!strcmp (argv[2], "YV12"))
+                if (!strcmp(argv[2], "YV12"))
                     overlay_format = SDL_YV12_OVERLAY;
-                else if (!strcmp (argv[2], "IYUV"))
+                else if (!strcmp(argv[2], "IYUV"))
                     overlay_format = SDL_IYUV_OVERLAY;
-                else if (!strcmp (argv[2], "YUY2"))
+                else if (!strcmp(argv[2], "YUY2"))
                     overlay_format = SDL_YUY2_OVERLAY;
-                else if (!strcmp (argv[2], "UYVY"))
+                else if (!strcmp(argv[2], "UYVY"))
                     overlay_format = SDL_UYVY_OVERLAY;
-                else if (!strcmp (argv[2], "YVYU"))
+                else if (!strcmp(argv[2], "YVYU"))
                     overlay_format = SDL_YVYU_OVERLAY;
                 else {
-                    fprintf (stderr,
-                             "The -format option %s is not recognized\n",
-                             argv[2]);
+                    fprintf(stderr,
+                            "The -format option %s is not recognized\n",
+                            argv[2]);
                     return (1);
                 }
                 argv += 2;
                 argc -= 2;
             } else {
-                fprintf (stderr, "The -format option requires an argument\n");
+                fprintf(stderr, "The -format option requires an argument\n");
                 return (1);
             }
-        } else if (strcmp (argv[1], "-hw") == 0) {
+        } else if (strcmp(argv[1], "-hw") == 0) {
             video_flags |= SDL_HWSURFACE;
             argv += 1;
             argc -= 1;
-        } else if (strcmp (argv[1], "-flip") == 0) {
+        } else if (strcmp(argv[1], "-flip") == 0) {
             video_flags |= SDL_DOUBLEBUF;
             argv += 1;
             argc -= 1;
-        } else if (strcmp (argv[1], "-scale") == 0) {
+        } else if (strcmp(argv[1], "-scale") == 0) {
             scale = 1;
             argv += 1;
             argc -= 1;
-        } else if (strcmp (argv[1], "-mono") == 0) {
+        } else if (strcmp(argv[1], "-mono") == 0) {
             monochrome = 1;
             argv += 1;
             argc -= 1;
-        } else if ((strcmp (argv[1], "-help") == 0)
-                   || (strcmp (argv[1], "-h") == 0)) {
-            PrintUsage (argv0);
+        } else if ((strcmp(argv[1], "-help") == 0)
+                   || (strcmp(argv[1], "-h") == 0)) {
+            PrintUsage(argv0);
             return (1);
-        } else if (strcmp (argv[1], "-fullscreen") == 0) {
+        } else if (strcmp(argv[1], "-fullscreen") == 0) {
             video_flags |= SDL_FULLSCREEN;
             argv += 1;
             argc -= 1;
         } else
             break;
     }
-    if (SDL_Init (SDL_INIT_VIDEO) < 0) {
-        fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());
+    if (SDL_Init(SDL_INIT_VIDEO) < 0) {
+        fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
         return (1);
     }
 
     /* Initialize the display */
-    screen = SDL_SetVideoMode (w, h, desired_bpp, video_flags);
+    screen = SDL_SetVideoMode(w, h, desired_bpp, video_flags);
     if (screen == NULL) {
-        fprintf (stderr, "Couldn't set %dx%dx%d video mode: %s\n",
-                 w, h, desired_bpp, SDL_GetError ());
-        quit (1);
+        fprintf(stderr, "Couldn't set %dx%dx%d video mode: %s\n",
+                w, h, desired_bpp, SDL_GetError());
+        quit(1);
     }
-    printf ("Set%s %dx%dx%d mode\n",
-            screen->flags & SDL_FULLSCREEN ? " fullscreen" : "",
-            screen->w, screen->h, screen->format->BitsPerPixel);
-    printf ("(video surface located in %s memory)\n",
-            (screen->flags & SDL_HWSURFACE) ? "video" : "system");
+    printf("Set%s %dx%dx%d mode\n",
+           screen->flags & SDL_FULLSCREEN ? " fullscreen" : "",
+           screen->w, screen->h, screen->format->BitsPerPixel);
+    printf("(video surface located in %s memory)\n",
+           (screen->flags & SDL_HWSURFACE) ? "video" : "system");
     if (screen->flags & SDL_DOUBLEBUF) {
-        printf ("Double-buffering enabled\n");
+        printf("Double-buffering enabled\n");
         flip = 1;
     }
 
     /* Set the window manager title bar */
-    SDL_WM_SetCaption ("SDL test overlay", "testoverlay");
+    SDL_WM_SetCaption("SDL test overlay", "testoverlay");
 
     /* Load picture */
     bmpfile = (argv[1] ? argv[1] : "sample.bmp");
-    pic = SDL_LoadBMP (bmpfile);
+    pic = SDL_LoadBMP(bmpfile);
     if (pic == NULL) {
-        fprintf (stderr, "Couldn't load %s: %s\n", bmpfile, SDL_GetError ());
-        quit (1);
+        fprintf(stderr, "Couldn't load %s: %s\n", bmpfile, SDL_GetError());
+        quit(1);
     }
 
     /* Convert the picture to 32bits, for easy conversion */
@@ -490,73 +490,73 @@
         format.colorkey = 0;
         format.alpha = 0;
 
-        newsurf = SDL_ConvertSurface (pic, &format, SDL_SWSURFACE);
+        newsurf = SDL_ConvertSurface(pic, &format, SDL_SWSURFACE);
         if (!newsurf) {
-            fprintf (stderr, "Couldn't convert picture to 32bits RGB: %s\n",
-                     SDL_GetError ());
-            quit (1);
+            fprintf(stderr, "Couldn't convert picture to 32bits RGB: %s\n",
+                    SDL_GetError());
+            quit(1);
         }
-        SDL_FreeSurface (pic);
+        SDL_FreeSurface(pic);
         pic = newsurf;
     }
 
     /* Create the overlay */
-    overlay = SDL_CreateYUVOverlay (pic->w, pic->h, overlay_format, screen);
+    overlay = SDL_CreateYUVOverlay(pic->w, pic->h, overlay_format, screen);
     if (overlay == NULL) {
-        fprintf (stderr, "Couldn't create overlay: %s\n", SDL_GetError ());
-        quit (1);
+        fprintf(stderr, "Couldn't create overlay: %s\n", SDL_GetError());
+        quit(1);
     }
-    printf ("Created %dx%dx%d %s %s overlay\n", overlay->w, overlay->h,
-            overlay->planes, overlay->hw_overlay ? "hardware" : "software",
-            overlay->format == SDL_YV12_OVERLAY ? "YV12" : overlay->format ==
-            SDL_IYUV_OVERLAY ? "IYUV" : overlay->format ==
-            SDL_YUY2_OVERLAY ? "YUY2" : overlay->format ==
-            SDL_UYVY_OVERLAY ? "UYVY" : overlay->format ==
-            SDL_YVYU_OVERLAY ? "YVYU" : "Unknown");
+    printf("Created %dx%dx%d %s %s overlay\n", overlay->w, overlay->h,
+           overlay->planes, overlay->hw_overlay ? "hardware" : "software",
+           overlay->format == SDL_YV12_OVERLAY ? "YV12" : overlay->format ==
+           SDL_IYUV_OVERLAY ? "IYUV" : overlay->format ==
+           SDL_YUY2_OVERLAY ? "YUY2" : overlay->format ==
+           SDL_UYVY_OVERLAY ? "UYVY" : overlay->format ==
+           SDL_YVYU_OVERLAY ? "YVYU" : "Unknown");
     for (i = 0; i < overlay->planes; i++) {
-        printf ("  plane %d: pitch=%d\n", i, overlay->pitches[i]);
+        printf("  plane %d: pitch=%d\n", i, overlay->pitches[i]);
     }
 
     /* Convert to YUV, and draw to the overlay */
 #ifdef BENCHMARK_SDL
-    then = SDL_GetTicks ();
+    then = SDL_GetTicks();
 #endif
     switch (overlay->format) {
     case SDL_YV12_OVERLAY:
-        ConvertRGBtoYV12 (pic, overlay, monochrome, luminance);
+        ConvertRGBtoYV12(pic, overlay, monochrome, luminance);
         break;
     case SDL_UYVY_OVERLAY:
-        ConvertRGBtoUYVY (pic, overlay, monochrome, luminance);
+        ConvertRGBtoUYVY(pic, overlay, monochrome, luminance);
         break;
     case SDL_YVYU_OVERLAY:
-        ConvertRGBtoYVYU (pic, overlay, monochrome, luminance);
+        ConvertRGBtoYVYU(pic, overlay, monochrome, luminance);
         break;
     case SDL_YUY2_OVERLAY:
-        ConvertRGBtoYUY2 (pic, overlay, monochrome, luminance);
+        ConvertRGBtoYUY2(pic, overlay, monochrome, luminance);
         break;
     case SDL_IYUV_OVERLAY:
-        ConvertRGBtoIYUV (pic, overlay, monochrome, luminance);
+        ConvertRGBtoIYUV(pic, overlay, monochrome, luminance);
         break;
     default:
-        printf ("cannot convert RGB picture to obtained YUV format!\n");
-        quit (1);
+        printf("cannot convert RGB picture to obtained YUV format!\n");
+        quit(1);
         break;
     }
 #ifdef BENCHMARK_SDL
-    now = SDL_GetTicks ();
-    printf ("Conversion Time: %d milliseconds\n", now - then);
+    now = SDL_GetTicks();
+    printf("Conversion Time: %d milliseconds\n", now - then);
 #endif
 
     /* Do all the drawing work */
 #ifdef BENCHMARK_SDL
-    then = SDL_GetTicks ();
+    then = SDL_GetTicks();
 #endif
-    Draw ();
+    Draw();
 #ifdef BENCHMARK_SDL
-    now = SDL_GetTicks ();
-    printf ("Time: %d milliseconds\n", now - then);
+    now = SDL_GetTicks();
+    printf("Time: %d milliseconds\n", now - then);
 #endif
-    SDL_Delay (delay * 1000);
-    SDL_Quit ();
+    SDL_Delay(delay * 1000);
+    SDL_Quit();
     return (0);
 }