[cairo-commit] cairo/src cairo-gstate-private.h, 1.8, 1.9 cairo-gstate.c, 1.131, 1.132

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-gstate-private.h cairo-gstate.c 
Log Message:

        * src/cairo-gstate-private.h:
        * src/cairo-gstate.c: (_cairo_gstate_init): Remove unused fields
        from cairo_gstate_t, (font_family, font_slant,
        font_weight). Reorder fields to match between declaration and
        initialization and to put the most problematic fields (surface and
        source) at the end. No intended changes in functionality.


Index: cairo-gstate-private.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate-private.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cairo-gstate-private.h	26 May 2005 18:35:46 -0000	1.8
+++ cairo-gstate-private.h	1 Jun 2005 20:13:10 -0000	1.9
@@ -80,26 +80,22 @@
     int num_dashes;
     double dash_offset;
 
-    char *font_family; /* NULL means CAIRO_FONT_FAMILY_DEFAULT; */
-    cairo_font_slant_t font_slant; 
-    cairo_font_weight_t font_weight;
-
     cairo_font_face_t *font_face;
     cairo_scaled_font_t *scaled_font;	/* Specific to the current CTM */
 
-    cairo_surface_t *surface;
-
-    cairo_pattern_t *source;
+    cairo_matrix_t font_matrix;
 
     cairo_clip_t clip;
 
-    cairo_matrix_t font_matrix;
-
     cairo_matrix_t ctm;
     cairo_matrix_t ctm_inverse;
 
     cairo_pen_t pen_regular;
 
+    cairo_surface_t *surface;
+
+    cairo_pattern_t *source;
+
     struct _cairo_gstate *next;
 };
 

Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- cairo-gstate.c	1 Jun 2005 07:29:24 -0000	1.131
+++ cairo-gstate.c	1 Jun 2005 20:13:10 -0000	1.132
@@ -105,27 +105,27 @@
     gstate->num_dashes = 0;
     gstate->dash_offset = 0.0;
 
-    gstate->scaled_font = NULL;
     gstate->font_face = NULL;
+    gstate->scaled_font = NULL;
 
     cairo_matrix_init_scale (&gstate->font_matrix,
 			     CAIRO_GSTATE_DEFAULT_FONT_SIZE, 
 			     CAIRO_GSTATE_DEFAULT_FONT_SIZE);
     
-    gstate->surface = NULL;
-
     gstate->clip.region = NULL;
     gstate->clip.surface = NULL;
     gstate->clip.serial = 0;
 
-    gstate->source = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK);
-    if (!gstate->source)
-	return CAIRO_STATUS_NO_MEMORY;    
-
     _cairo_gstate_identity_matrix (gstate);
 
     _cairo_pen_init_empty (&gstate->pen_regular);
 
+    gstate->surface = NULL;
+
+    gstate->source = _cairo_pattern_create_solid (CAIRO_COLOR_BLACK);
+    if (!gstate->source)
+	return CAIRO_STATUS_NO_MEMORY;    
+
     gstate->next = NULL;
 
     status = _cairo_gstate_set_target_surface (gstate, target);