[cairo-commit] cairo-demo/png ChangeLog, 1.29, 1.30 bevels.c, 1.5, 1.6 outline.c, 1.8, 1.9 snapping.c, 1.7, 1.8

[Behdad Esfahbod]

Committed by: behdad

Update of /cvs/cairo/cairo-demo/png
In directory gabe:/tmp/cvs-serv10314

Modified Files:
	ChangeLog bevels.c outline.c snapping.c 
Log Message:
2005-07-29  Behdad Esfahbod  <behdad at behdad.org

        * bevels.c: Remove C99ism. Shut gcc warning off.
        * outline.c: Remove useless argument. Shut gcc warning off.
        * snapping.c: Don't shadow y1. Shut gcc warning off.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/png/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	17 May 2005 15:24:39 -0000	1.29
+++ ChangeLog	29 Jul 2005 07:48:07 -0000	1.30
@@ -1,3 +1,9 @@
+2005-07-29  Behdad Esfahbod  <behdad at behdad.org
+
+	* bevels.c: Remove C99ism. Shut gcc warning off.
+	* outline.c: Remove useless argument. Shut gcc warning off.
+	* snapping.c: Don't shadow y1. Shut gcc warning off.
+
 2005-05-17  Carl Worth  <cworth at cworth.org>
 
 	* bevels.c:

Index: bevels.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/png/bevels.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- bevels.c	17 May 2005 15:24:39 -0000	1.5
+++ bevels.c	29 Jul 2005 07:48:07 -0000	1.6
@@ -178,10 +178,10 @@
 static void
 flat_circle (cairo_t *cr, int x, int y, int width)
 {
-    cairo_save (cr);
-
     double radius = (width - 1) / 2.0;
 
+    cairo_save (cr);
+
     /* Fill background */
     set_hex_color (cr, HI_COLOR_1);
     cairo_arc (cr, x+radius+0.5, y+radius+0.5, radius-1,

Index: outline.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/png/outline.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- outline.c	17 May 2005 15:24:39 -0000	1.8
+++ outline.c	29 Jul 2005 07:48:07 -0000	1.9
@@ -40,7 +40,7 @@
 draw_cylinder (cairo_t *cr, double width, double height);
 
 cairo_pattern_t *
-create_gradient (cairo_t *cr, double width, double height);
+create_gradient (double width, double height);
 
 #define WIDTH 750
 #define HEIGHT 500
@@ -74,7 +74,7 @@
 }
 
 cairo_pattern_t *
-create_gradient (cairo_t *cr, double width, double height)
+create_gradient (double width, double height)
 {
     cairo_pattern_t *gradient;
 
@@ -102,7 +102,7 @@
     pad = (surface_width - (3 * width)) / 2.0;
     height = surface_height;
 
-    gradient = create_gradient (cr, width, height);
+    gradient = create_gradient (width, height);
 
     cairo_set_source (cr, gradient);
     draw_flat (cr, width, height);

Index: snapping.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/png/snapping.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- snapping.c	17 May 2005 15:24:39 -0000	1.7
+++ snapping.c	29 Jul 2005 07:48:07 -0000	1.8
@@ -199,17 +199,17 @@
 
 static void
 spc_curve_to (void *closure,
-	      double x1, double y1,
+	      double x1, double y1_,
 	      double x2, double y2,
 	      double x3, double y3)
 {
     snap_path_closure_t *spc = closure;
     cairo_t *cr = spc->cr;
     spc_new_path_perhaps (spc);
-    snap_point (spc, &x1, &y1);
+    snap_point (spc, &x1, &y1_);
     snap_point (spc, &x2, &y2);
     snap_point (spc, &x3, &y3);
-    cairo_curve_to (cr, x1, y1, x2, y2, x3, y3);
+    cairo_curve_to (cr, x1, y1_, x2, y2, x3, y3);
 }
 
 static void