[cairo-commit] cairo/util cairo-api-update,1.1,1.2

Carl Worth commit at pdx.freedesktop.org
Fri May 6 13:32:56 PDT 2005


Committed by: cworth

Update of /cvs/cairo/cairo/util
In directory gabe:/tmp/cvs-serv23395/util

Modified Files:
	cairo-api-update 
Log Message:

       * src/cairo.c:
        * src/cairo.h: Eliminate the following deprecated functions from
        cairo's interface:

                cairo_copy
                cairo_get_path
                cairo_get_path_flat
                cairo_matrix_create
                cairo_matrix_destroy
                cairo_matrix_copy
                cairo_matrix_get_affine
                cairo_surface_set_repeat
                cairo_surface_set_matrix
                cairo_surface_get_matrix
                cairo_surface_set_filter
                cairo_surface_get_filter

        Also, eliminate all support for compiling against, or running with
        old, deprecated names for functions.

        * src/cairo-ft-font.c: (_compute_transform):
        * src/cairo-gstate.c:
        * src/cairo-image-surface.c: (cairo_image_surface_create_for_data):
        * src/cairo-matrix.c: (_cairo_matrix_get_affine),
        (_cairo_matrix_compute_adjoint),
        (_cairo_matrix_is_integer_translation):
        * src/cairo-pattern.c: (cairo_pattern_add_color_stop_rgba),
        (cairo_pattern_set_matrix), (cairo_pattern_get_matrix),
        (_cairo_image_data_set_linear), (_cairo_linear_pattern_classify),
        (_cairo_image_data_set_radial):
        * src/cairo-pdf-surface.c: (_cairo_pdf_surface_composite_image),
        (_cairo_pdf_surface_composite_pdf), (emit_surface_pattern),
        (emit_linear_pattern), (emit_radial_pattern):
        * src/cairo-surface.c:
        * src/cairo-xlib-surface.c:
        (_cairo_xlib_surface_acquire_source_image),
        (cairo_xlib_surface_create):
        * src/cairo.c: (cairo_set_source_rgba), (cairo_set_source),
        (cairo_get_source), (cairo_transform), (cairo_identity_matrix),
        (cairo_user_to_device), (cairo_user_to_device_distance),
        (cairo_device_to_user), (cairo_device_to_user_distance),
        (cairo_reset_clip), (cairo_select_font_face), (cairo_font_extents),
        (cairo_set_font_size), (cairo_get_operator), (cairo_get_rgb_color),
        (cairo_get_tolerance), (cairo_get_fill_rule),
        (cairo_get_line_width), (cairo_get_line_cap),
        (cairo_get_line_join), (cairo_get_miter_limit), (cairo_get_matrix),
        (cairo_get_target), (cairo_status), (cairo_status_string):
        * src/cairoint.h:
        * test/cairo-test.c: (cairo_test_create_png_pattern):
        * test/gradient-alpha.c: (draw):
        * test/mask.c: (set_gradient_pattern), (set_image_pattern):
        * test/move-to-show-surface.c: (draw):
        * test/select-font-no-show-text.c: (draw):
        * test/set-source.c: (draw):
        * test/text-cache-crash.c: (draw):
        * test/text-rotate.c: (draw):
        * test/transforms.c: (draw_L_shape):
        * test/translate-show-surface.c: (draw):
        * test/trap-clip.c: (set_gradient_pattern), (set_image_pattern):
        * util/cairo-api-update:

        Deal with all of the removals.


Index: cairo-api-update
===================================================================
RCS file: /cvs/cairo/cairo/util/cairo-api-update,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cairo-api-update	4 Sep 2003 13:52:02 -0000	1.1
+++ cairo-api-update	6 May 2005 20:32:53 -0000	1.2
@@ -15,20 +15,42 @@
 
 	cp $file $backup
 	sed -e '
-		s/cairo_get_operator/cairo_current_operator/g
-		s/cairo_get_rgb_color/cairo_current_rgb_color/g
-		s/cairo_get_alpha/cairo_current_alpha/g
-		s/cairo_get_tolerance/cairo_current_tolerance/g
-		s/cairo_get_current_point/cairo_current_point/g
-		s/cairo_get_fill_rule/cairo_current_fill_rule/g
-		s/cairo_get_line_width/cairo_current_line_width/g
-		s/cairo_get_line_cap/cairo_current_line_cap/g
-		s/cairo_get_line_join/cairo_current_line_join/g
-		s/cairo_get_miter_limit/cairo_current_miter_limit/g
-		s/cairo_get_matrix/cairo_current_matrix/g
-		s/cairo_get_target_surface/cairo_current_target_surface/g
-		s/cairo_get_status_string/cairo_status_string/g
+		s/cairo_current_font_extents/cairo_font_extents/g
+		s/cairo_get_font_extents/cairo_font_extents/g
+		s/cairo_current_operator/cairo_get_operator/g
+		s/cairo_current_tolerance/cairo_get_tolerance/g
+		s/cairo_current_point/cairo_get_current_point/g
+		s/cairo_current_fill_rule/cairo_get_fill_rule/g
+		s/cairo_current_line_width/cairo_get_line_width/g
+		s/cairo_current_line_cap/cairo_get_line_cap/g
+		s/cairo_current_line_join/cairo_get_line_join/g
+		s/cairo_current_miter_limit/cairo_get_miter_limit/g
+		s/cairo_current_matrix/cairo_get_matrix/g
+		s/cairo_current_target_surface/cairo_get_target_surface/g
 		s/cairo_get_status/cairo_status/g
+		s/cairo_get_status_string/cairo_status_string/g
+		s/cairo_concat_matrix/cairo_transform/g
+		s/cairo_scale_font/cairo_set_font_size/g
+		s/cairo_select_font/cairo_select_font_face/g
+		s/cairo_transform_font/cairo_set_font_matrix/g
+		s/cairo_transform_point/cairo_user_to_device/g
+		s/cairo_transform_distance/cairo_user_to_device_distance/g
+		s/cairo_inverse_transform_point/cairo_device_to_user/g
+		s/cairo_inverse_transform_distance/cairo_device_to_user_distance/g
+		s/cairo_init_clip/cairo_reset_clip/g
+		s/cairo_surface_create_for_image/cairo_image_surface_create_for_data/g
+		s/cairo_default_matrix/cairo_identity_matrix/g
+		s/cairo_matrix_set_affine/cairo_matrix_init/g
+		s/cairo_matrix_set_identity/cairo_matrix_init_identity/g
+		s/cairo_pattern_add_color_stop/cairo_pattern_add_color_stop_rgba/g
+		s/cairo_set_rgb_color/cairo_set_source_rgb/g
+		s/cairo_set_pattern/cairo_set_source/g
+		s/CAIRO_OPERATOR_SRC/CAIRO_OPERATOR_SOURCE/g
+		s/CAIRO_OPERATOR_DST/CAIRO_OPERATOR_DEST/g
+		s/CAIRO_OPERATOR_OVER_REVERSE/CAIRO_OPERATOR_DEST_OVER/g
+		s/CAIRO_OPERATOR_IN_REVERSE/CAIRO_OPERATOR_DEST_IN/g
+		s/CAIRO_OPERATOR_OUT_REVERSE/CAIRO_OPERATOR_DEST_OUT/g
+		s/CAIRO_OPERATOR_ATOP_REVERSE/CAIRO_OPERATOR_DEST_ATOP/g
 		' $backup > $file
 }
 




More information about the cairo-commit mailing list