[cairo-commit] cairo/src cairo-gstate.c,1.182,1.183

Carl Worth commit at pdx.freedesktop.org
Mon Nov 7 10:17:39 PST 2005


Committed by: cworth

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

Modified Files:
	cairo-gstate.c 
Log Message:

2005-11-07  Carl Worth  <cworth at cworth.org>

        * src/cairo-gstate.c: (_cairo_gstate_init_copy),
        (_cairo_gstate_fini): Reorder function bodies to match to match
        the order of the fields in the structure definition.


Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- cairo-gstate.c	7 Nov 2005 18:02:06 -0000	1.182
+++ cairo-gstate.c	7 Nov 2005 18:17:37 -0000	1.183
@@ -155,14 +155,14 @@
     if (status)
 	return status;
 
-    _cairo_clip_init_copy (&gstate->clip, &other->clip);
-
     if (gstate->font_face)
 	cairo_font_face_reference (gstate->font_face);
 
     if (gstate->scaled_font)
 	cairo_scaled_font_reference (gstate->scaled_font);
-    
+
+    _cairo_clip_init_copy (&gstate->clip, &other->clip);
+
     cairo_surface_reference (gstate->target);
 
     cairo_pattern_reference (gstate->source);
@@ -173,22 +173,22 @@
 static void
 _cairo_gstate_fini (cairo_gstate_t *gstate)
 {
+    _cairo_stroke_style_fini (&gstate->stroke_style);
+
     if (gstate->font_face)
 	cairo_font_face_destroy (gstate->font_face);
 
     if (gstate->scaled_font)
 	cairo_scaled_font_destroy (gstate->scaled_font);
 
+    _cairo_clip_fini (&gstate->clip);
+
     if (gstate->target) {
 	cairo_surface_destroy (gstate->target);
 	gstate->target = NULL;
     }
 
-    _cairo_clip_fini (&gstate->clip);
-
     cairo_pattern_destroy (gstate->source);
-
-    _cairo_stroke_style_fini (&gstate->stroke_style);
 }
 
 void



More information about the cairo-commit mailing list