[quartz] Delete the typedef of GdkDevicePrivate

[~andy/gtk] / gdk-pixbuf / pixops / timescale.c

diff --git a/gdk-pixbuf/pixops/timescale.c b/gdk-pixbuf/pixops/timescale.c
index a7fffc48860f0cff9a29dca144c4027d295a7205..cac11d9c1c60b414043fdb5251e74ed8f5736d77 100644 (file)
--- a/gdk-pixbuf/pixops/timescale.c
+++ b/gdk-pixbuf/pixops/timescale.c
@@ -16,7 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <config.h>
+#include "config.h"
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
@@ -26,12 +26,13 @@
 
 static GTimeVal start_time;
 
-void start_timing (void)
+static void 
+start_timing (void)
 {
   g_get_current_time (&start_time);
 }
 
-double
+static double
 stop_timing (const char *test, int iterations, int bytes)
 {
   GTimeVal stop_time;
@@ -53,7 +54,7 @@ stop_timing (const char *test, int iterations, int bytes)
   return ((double)bytes * iterations) / (1000*msecs);
 }
 
-void
+static void
 init_array (double times[3][3][4])
 {
   int i, j, k;
@@ -64,7 +65,7 @@ init_array (double times[3][3][4])
        times[i][j][k] = -1;
 }
 
-void
+static void
 dump_array (double times[3][3][4])
 {
   int i, j;
@@ -118,7 +119,7 @@ dump_array (double times[3][3][4])
 int main (int argc, char **argv)
 {
   int src_width, src_height, dest_width, dest_height;
-  char *src_buf, *dest_buf;
+  unsigned char *src_buf, *dest_buf;
   int src_index, dest_index;
   int i;
   double scale_times[3][3][4];
@@ -200,9 +201,13 @@ int main (int argc, char **argv)
                start_timing ();
                for (i = 0; i < ITERS; i++)
                  {
-                   _pixops_scale (dest_buf, 0, 0, dest_width, dest_height, dest_rowstride, dest_channels, dest_has_alpha,
-                                  src_buf, src_width, src_height, src_rowstride, src_channels, src_has_alpha,
-                                  (double)dest_width / src_width, (double)dest_height / src_height,
+                   _pixops_scale (dest_buf, dest_width, dest_height,
+                                  dest_rowstride, dest_channels,
+                                  dest_has_alpha, src_buf, src_width,
+                                  src_height, src_rowstride, src_channels,
+                                  src_has_alpha, 0, 0, 0, 0, 0, 0,
+                                  (double)dest_width / src_width,
+                                  (double)dest_height / src_height,
                                   filter_level);
                  }
                scale_times[src_index][dest_index][filter_level] =
@@ -212,21 +217,32 @@ int main (int argc, char **argv)
            start_timing ();
            for (i = 0; i < ITERS; i++)
              {
-               _pixops_composite (dest_buf, 0, 0, dest_width, dest_height, dest_rowstride, dest_channels, dest_has_alpha,
-                                  src_buf, src_width, src_height, src_rowstride, src_channels, src_has_alpha,
-                                  (double)dest_width / src_width, (double)dest_height / src_height,
+               _pixops_composite (dest_buf, dest_width, dest_height,
+                                  dest_rowstride, dest_channels,
+                                  dest_has_alpha, src_buf, src_width,
+                                  src_height, src_rowstride, src_channels,
+                                  src_has_alpha, 0, 0, 0, 0, 0, 0,
+                                  (double)dest_width / src_width,
+                                  (double)dest_height / src_height,
                                   filter_level, 255);
              }
            composite_times[src_index][dest_index][filter_level] =
-             stop_timing ("   composite\t\t", ITERS, dest_height * dest_width);
+             stop_timing ("   composite\t\t", ITERS,
+                          dest_height * dest_width);
 
            start_timing ();
            for (i = 0; i < ITERS; i++)
              {
-               _pixops_composite_color (dest_buf, 0, 0, dest_width, dest_height, dest_rowstride, dest_channels, dest_has_alpha,
-                                        src_buf, src_width, src_height, src_rowstride, src_channels, src_has_alpha,
-                                        (double)dest_width / src_width, (double)dest_height / src_height,
-                                        filter_level, 255, 0, 0, 16, 0xaaaaaa, 0x555555);
+               _pixops_composite_color (dest_buf, dest_width, dest_height,
+                                        dest_rowstride, dest_channels,
+                                        dest_has_alpha, src_buf, src_width,
+                                        src_height, src_rowstride,
+                                        src_channels, src_has_alpha, 0, 0,
+                                        0, 0, 0, 0,
+                                        (double)dest_width / src_width,
+                                        (double)dest_height / src_height,
+                                        filter_level, 255, 0, 0, 16,
+                                        0xaaaaaa, 0x555555);
              }
            composite_color_times[src_index][dest_index][filter_level] =
              stop_timing ("   composite color\t", ITERS, dest_height * dest_width);