[cairo-commit] libsvg-cairo/src svg_cairo.c,1.31,1.32

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/libsvg-cairo/src
In directory gabe:/tmp/cvs-serv27078/src

Modified Files:
	svg_cairo.c 
Log Message:

        * src/svg_cairo.c: Fix a bunch of indentation.
        (_svg_cairo_render_text): Track unsigned char* change from libsvg.
        (_svg_cairo_render_image): Track unsigned char* change from cairo.


Index: svg_cairo.c
===================================================================
RCS file: /cvs/cairo/libsvg-cairo/src/svg_cairo.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- svg_cairo.c	2 Apr 2005 14:02:34 -0000	1.31
+++ svg_cairo.c	11 Apr 2005 18:27:02 -0000	1.32
@@ -45,30 +45,31 @@
 
 static svg_status_t
 _svg_cairo_curve_to (void *closure,
-		double x1, double y1,
-		double x2, double y2,
-		double x3, double y3);
+		     double x1, double y1,
+		     double x2, double y2,
+		     double x3, double y3);
 
 static svg_status_t
 _svg_cairo_quadratic_curve_to (void *closure,
-			  double x1, double y1,
-			  double x2, double y2);
+			       double x1, double y1,
+			       double x2, double y2);
 
 static svg_status_t
-_svg_cairo_arc_to (void *closure,
-	      double	rx,
-	      double	ry,
-	      double	x_axis_rotation,
-	      int	large_arc_flag,
-	      int	sweep_flag,
-	      double	x,
-	      double	y);
+_svg_cairo_arc_to (void	       *closure,
+		   double	rx,
+		   double	ry,
+		   double	x_axis_rotation,
+		   int		large_arc_flag,
+		   int		sweep_flag,
+		   double	x,
+		   double	y);
 
 static void
 _svg_path_arc_segment (cairo_t *cr,
-		       double xc, double yc,
-		       double th0, double th1,
-		       double rx, double ry, double x_axis_rotation);
+		       double   xc,  double yc,
+		       double   th0, double th1,
+		       double   rx,  double ry,
+		       double   x_axis_rotation);
 
 static svg_status_t
 _svg_cairo_close_path (void *closure);
@@ -132,60 +133,60 @@
 
 static svg_status_t
 _svg_cairo_transform (void *closure,
-		  double a, double b,
-		  double c, double d,
-		  double e, double f);
+		      double a, double b,
+		      double c, double d,
+		      double e, double f);
 
 static svg_status_t
 _svg_cairo_apply_view_box (void *closure,
-		      svg_view_box_t view_box,
-		      svg_length_t *width,
-		      svg_length_t *height);
+			   svg_view_box_t view_box,
+			   svg_length_t *width,
+			   svg_length_t *height);
 
 static svg_status_t
 _svg_cairo_set_viewport_dimension (void *closure,
-		    	      svg_length_t *width,
-		    	      svg_length_t *height);
+				   svg_length_t *width,
+				   svg_length_t *height);
 
 static svg_status_t
 _svg_cairo_render_line (void *closure,
-		   svg_length_t *x1_len, svg_length_t *y1_len,
-		   svg_length_t *x2_len, svg_length_t *y2_len);
+			svg_length_t *x1_len, svg_length_t *y1_len,
+			svg_length_t *x2_len, svg_length_t *y2_len);
 
 static svg_status_t
 _svg_cairo_render_path (void *closure);
 
 static svg_status_t
 _svg_cairo_render_ellipse (void *closure,
-		      svg_length_t *cx,
-		      svg_length_t *cy,
-		      svg_length_t *rx,
-		      svg_length_t *ry);
+			   svg_length_t *cx,
+			   svg_length_t *cy,
+			   svg_length_t *rx,
+			   svg_length_t *ry);
 
 static svg_status_t
-_svg_cairo_render_rect (void *closure,
-		   svg_length_t *x,
-		   svg_length_t *y,
-		   svg_length_t *width,
-		   svg_length_t *height,
-		   svg_length_t *rx,
-		   svg_length_t *ry);
+_svg_cairo_render_rect (void 	     *closure,
+			svg_length_t *x,
+			svg_length_t *y,
+			svg_length_t *width,
+			svg_length_t *height,
+			svg_length_t *rx,
+			svg_length_t *ry);
 
 static svg_status_t
-_svg_cairo_render_text (void *closure,
-		   svg_length_t *x_len,
-		   svg_length_t *y_len,
-		   unsigned char *utf8);
+_svg_cairo_render_text (void 	      *closure,
+			svg_length_t  *x_len,
+			svg_length_t  *y_len,
+			const char    *utf8);
 
 static svg_status_t
 _svg_cairo_render_image (void		*closure,
-		    unsigned char	*data,
-		    unsigned int	data_width,
-		    unsigned int	data_height,
-		    svg_length_t	*x,
-		    svg_length_t	*y,
-		    svg_length_t	*width,
-		    svg_length_t	*height);
+			 unsigned char	*data,
+			 unsigned int	data_width,
+			 unsigned int	data_height,
+			 svg_length_t	*x,
+			 svg_length_t	*y,
+			 svg_length_t	*width,
+			 svg_length_t	*height);
 
 static svg_status_t
 _cairo_status_to_svg_status (cairo_status_t xr_status);
@@ -1137,9 +1138,9 @@
 
 static svg_status_t
 _svg_cairo_render_text (void *closure,
-		   svg_length_t *x_len,
-		   svg_length_t *y_len,
-		   unsigned char *utf8)
+			svg_length_t *x_len,
+			svg_length_t *y_len,
+			const char *utf8)
 {
     svg_cairo_t *svg_cairo = closure;
     double x, y;
@@ -1211,7 +1212,7 @@
     _svg_cairo_length_to_pixel (svg_cairo, width_len, &width);
     _svg_cairo_length_to_pixel (svg_cairo, height_len, &height);
 
-    surface = cairo_surface_create_for_image ((char *)data, CAIRO_FORMAT_ARGB32,
+    surface = cairo_surface_create_for_image ((unsigned char *)data, CAIRO_FORMAT_ARGB32,
 					      data_width, data_height, data_width *4);
     cairo_move_to (svg_cairo->cr, x, y);
     cairo_scale (svg_cairo->cr, width / data_width, height / data_height);