Get rid of -2 names

1 files changed, 39 insertions, 39 deletions

diff --git a/src/cairo-pixman-surface.c b/src/cairo-pixman-surface.c
index 0f224363..ac44d664 100644
--- a/src/cairo-pixman-surface.c
+++ b/src/cairo-pixman-surface.c
@@ -845,8 +845,8 @@ set_properties (pixman_image_t *image, cairo_pattern_t *pattern, cairo_matrix_t
 }
 
 static int
-pimage_from_solid_pattern2 (command_buffer_t **buffer,
-			    cairo_solid_pattern_t *solid)
+pimage_from_solid_pattern (command_buffer_t **buffer,
+			   cairo_solid_pattern_t *solid)
 {
     pixman_color_t pcolor;
     pixman_image_t *image;
@@ -887,8 +887,8 @@ clean_up_acquire (pixman_image_t *image, void *closure)
 }
 
 static int
-pimage_from_surface_pattern2 (command_buffer_t **buffer,
-			      cairo_surface_pattern_t *pattern)
+pimage_from_surface_pattern (command_buffer_t **buffer,
+			     cairo_surface_pattern_t *pattern)
 {
     pixman_image_t *simage, *image;
     acquire_source_cleanup_t *info = NULL;
@@ -976,8 +976,8 @@ pimage_from_surface_pattern2 (command_buffer_t **buffer,
 #define PIXMAN_MAX_INT ((pixman_fixed_1 >> 1) - pixman_fixed_e) /* need to ensure deltas also fit */
 
 static int
-pimage_from_gradient_pattern2 (command_buffer_t **buffer,
-			       const cairo_gradient_pattern_t *pattern)
+pimage_from_gradient_pattern (command_buffer_t **buffer,
+			      const cairo_gradient_pattern_t *pattern)
 {
     pixman_gradient_stop_t *pstops;
     cairo_circle_double_t extremes[2];
@@ -1036,9 +1036,9 @@ pimage_from_gradient_pattern2 (command_buffer_t **buffer,
 }    
 
 static int
-pimage_from_mesh_pattern2 (command_buffer_t **buffer,
-			   cairo_pixman_surface_t *surface,
-			   const cairo_mesh_pattern_t *pattern)
+pimage_from_mesh_pattern (command_buffer_t **buffer,
+			  cairo_pixman_surface_t *surface,
+			  const cairo_mesh_pattern_t *pattern)
 {
     int width, height;
     pixman_image_t *image;
@@ -1084,9 +1084,9 @@ raster_source_clean_up (pixman_image_t *pixman_image,
 }
 
 static int
-pimage_from_raster_source_pattern2 (command_buffer_t **buffer,
-				    cairo_pixman_surface_t *psurface,
-				    const cairo_raster_source_pattern_t *pattern)
+pimage_from_raster_source_pattern (command_buffer_t **buffer,
+				   cairo_pixman_surface_t *psurface,
+				   const cairo_raster_source_pattern_t *pattern)
 {
     int width, height;
     cairo_surface_t *surface;
@@ -1146,35 +1146,35 @@ pimage_from_raster_source_pattern2 (command_buffer_t **buffer,
 }
 
 static int
-pimage_from_pattern2 (command_buffer_t **buffer,
-		      cairo_pixman_surface_t *surface,
-		      const cairo_pattern_t *pattern)
+pimage_from_pattern (command_buffer_t **buffer,
+		     cairo_pixman_surface_t *surface,
+		     const cairo_pattern_t *pattern)
 {
     switch (pattern->type)
     {
     case CAIRO_PATTERN_TYPE_SOLID:
-	return pimage_from_solid_pattern2 (
+	return pimage_from_solid_pattern (
 	    buffer, (cairo_solid_pattern_t *)pattern);
 	break;
 	
     case CAIRO_PATTERN_TYPE_SURFACE:
-	return pimage_from_surface_pattern2 (
+	return pimage_from_surface_pattern (
 	    buffer, (cairo_surface_pattern_t *)pattern);
 	break;
 	
     case CAIRO_PATTERN_TYPE_LINEAR:
     case CAIRO_PATTERN_TYPE_RADIAL:
-	return pimage_from_gradient_pattern2 (
+	return pimage_from_gradient_pattern (
 	    buffer, (cairo_gradient_pattern_t *)pattern);
 	break;
 
     case CAIRO_PATTERN_TYPE_MESH:
-	return pimage_from_mesh_pattern2 (
+	return pimage_from_mesh_pattern (
 	    buffer, surface, (cairo_mesh_pattern_t *)pattern);
 	break;
 
     case CAIRO_PATTERN_TYPE_RASTER_SOURCE:
-	return pimage_from_raster_source_pattern2 (
+	return pimage_from_raster_source_pattern (
 	    buffer, surface, (cairo_raster_source_pattern_t *)pattern);
 	break;
     }
@@ -1285,8 +1285,8 @@ traps_to_pixman_trapezoids (const cairo_traps_t *traps)
 }
 
 static int
-create_clip_image2 (command_buffer_t **buffer,
-		    const cairo_clip_t *clip, int width, int height)
+create_clip_image (command_buffer_t **buffer,
+		   const cairo_clip_t *clip, int width, int height)
 {
     cairo_int_status_t status;
     pixman_trapezoid_t *ptraps = NULL;
@@ -1454,7 +1454,7 @@ _pixman_operator (cairo_operator_t op)
 }
 
 static int
-combine_mask_and_clip2 (command_buffer_t **buffer, int mask_id, int clip_id)
+combine_mask_and_clip (command_buffer_t **buffer, int mask_id, int clip_id)
 {
     int combined_id;
 
@@ -1467,12 +1467,12 @@ combine_mask_and_clip2 (command_buffer_t **buffer, int mask_id, int clip_id)
 }
 
 static void
-clip_and_composite2 (command_buffer_t **buffer,
-		     cairo_pixman_surface_t *psurface,
-		     cairo_operator_t operator,
-		     const cairo_pattern_t *source,
-		     int mask_id,
-		     const cairo_clip_t *clip)
+clip_and_composite (command_buffer_t **buffer,
+		    cairo_pixman_surface_t *psurface,
+		    cairo_operator_t operator,
+		    const cairo_pattern_t *source,
+		    int mask_id,
+		    const cairo_clip_t *clip)
 {
     pixman_image_t *dest_image = psurface->pimage;
     int width = pixman_image_get_width (dest_image);
@@ -1484,8 +1484,8 @@ clip_and_composite2 (command_buffer_t **buffer,
 	return;
 
     dest_id = command_buffer_new_image (buffer, psurface->pimage);
-    clip_id = create_clip_image2 (buffer, clip, width, height);
-    src_id = pimage_from_pattern2 (buffer, psurface, source);
+    clip_id = create_clip_image (buffer, clip, width, height);
+    src_id = pimage_from_pattern (buffer, psurface, source);
     white_id = command_buffer_new_white (buffer);
     pop = _pixman_operator (operator);
 
@@ -1519,7 +1519,7 @@ clip_and_composite2 (command_buffer_t **buffer,
     }
     else if (pop == PIXMAN_OP_SRC)
     {
-	combined_id = combine_mask_and_clip2 (buffer, mask_id, clip_id);
+	combined_id = combine_mask_and_clip (buffer, mask_id, clip_id);
 
 	command_buffer_composite (
 	    buffer, dest_id, PIXMAN_OP_OUT_REVERSE, combined_id, white_id);
@@ -1529,7 +1529,7 @@ clip_and_composite2 (command_buffer_t **buffer,
     }
     else
     {
-	combined_id = combine_mask_and_clip2 (buffer, mask_id, clip_id);
+	combined_id = combine_mask_and_clip (buffer, mask_id, clip_id);
 
 	command_buffer_composite (
 	    buffer, dest_id, pop, src_id, combined_id);
@@ -1550,7 +1550,7 @@ cairo_pixman_surface_paint (void			*abstract_surface,
 
     mask_id = command_buffer_new_white (&buffer);
     
-    clip_and_composite2 (&buffer, psurface, op, source, mask_id, clip);
+    clip_and_composite (&buffer, psurface, op, source, mask_id, clip);
 
     return command_buffer_process (buffer, width, height);
 }
@@ -1568,9 +1568,9 @@ cairo_pixman_surface_mask (void				*abstract_surface,
     int height = pixman_image_get_height (psurface->pimage);
     int mask_id;
 
-    mask_id = pimage_from_pattern2 (&buffer, psurface, mask);
+    mask_id = pimage_from_pattern (&buffer, psurface, mask);
 
-    clip_and_composite2 (&buffer, psurface, op, source, mask_id, clip);
+    clip_and_composite (&buffer, psurface, op, source, mask_id, clip);
 
     return command_buffer_process (buffer, width, height);
 }
@@ -1609,7 +1609,7 @@ cairo_pixman_surface_stroke (void			*abstract_surface,
 	mask_id = command_buffer_new_traps (
 	    &buffer, antialias, traps.num_traps, ptraps);
 
-	clip_and_composite2 (
+	clip_and_composite (
 	    &buffer, psurface, op, source, mask_id, clip);
     }
 
@@ -1650,7 +1650,7 @@ cairo_pixman_surface_fill (void				*abstract_surface,
 	mask_id = command_buffer_new_traps (
 	    &buffer, antialias, traps.num_traps, ptraps);
 
-	clip_and_composite2 (
+	clip_and_composite (
 	    &buffer, psurface, op, source, mask_id, clip);
     }
 
@@ -1771,7 +1771,7 @@ cairo_pixman_surface_glyphs (void			*abstract_surface,
     }
 
     glyph_id = command_buffer_new_glyphs (&buffer, glyph_cache, pg - pglyphs, pglyphs);
-    clip_and_composite2 (
+    clip_and_composite (
 	&buffer, psurface, operator, source, glyph_id, clip);
 
     status = command_buffer_process (buffer, width, height);