Move internal convenience up from _cairo_gstate_set_source_solid to _cairo_set_source_solid so that all set_source functions flow through cairo_set_source.

4 files changed, 27 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a9eee17c..5766763cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-03  Carl Worth  <cworth@cworth.org>
+
+	* src/cairoint.h:
+	* src/cairo-gstate.c:
+	* src/cairo.c: (_cairo_set_source_solid), (cairo_set_source_rgb),
+	(cairo_set_source_rgba): Move internal convenience up from
+	_cairo_gstate_set_source_solid to _cairo_set_source_solid so that
+	all set_source functions flow through cairo_set_source.
+
 2005-06-01  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo-gstate.c: (_cairo_gstate_init): Remove obsolete
diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index 0b086e550..6b6a9e01b 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -393,24 +393,6 @@ _cairo_gstate_set_source (cairo_gstate_t  *gstate,
     return CAIRO_STATUS_SUCCESS;
 }
 
-cairo_status_t
-_cairo_gstate_set_source_solid (cairo_gstate_t	    *gstate,
-				const cairo_color_t *color)
-{
-    cairo_status_t status;
-    cairo_pattern_t *source;
-
-    source = _cairo_pattern_create_solid (color);
-    if (!source)
-	return CAIRO_STATUS_NO_MEMORY;
-
-    status = _cairo_gstate_set_source (gstate, source);
-
-    cairo_pattern_destroy (source);
-    
-    return CAIRO_STATUS_SUCCESS;
-}
-
 cairo_pattern_t *
 _cairo_gstate_get_source (cairo_gstate_t *gstate)
 {
diff --git a/src/cairo.c b/src/cairo.c
index 0905652c4..6c5026d9a 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -299,6 +299,22 @@ cairo_set_operator (cairo_t *cr, cairo_operator_t op)
     CAIRO_CHECK_SANITY (cr);
 }
 
+static void
+_cairo_set_source_solid (cairo_t *cr, const cairo_color_t *color)
+{
+    cairo_pattern_t *source;
+
+    source = _cairo_pattern_create_solid (color);
+    if (source == NULL) {
+	cr->status = CAIRO_STATUS_NO_MEMORY;
+	return;
+    }
+
+    cairo_set_source (cr, source);
+
+    cairo_pattern_destroy (source);
+}
+
 /**
  * cairo_set_source_rgb
  * @cr: a cairo context
@@ -329,7 +345,7 @@ cairo_set_source_rgb (cairo_t *cr, double red, double green, double blue)
 
     _cairo_color_init_rgb (&color, red, green, blue);
 
-    cr->status = _cairo_gstate_set_source_solid (cr->gstate, &color);
+    _cairo_set_source_solid (cr, &color);
     
     CAIRO_CHECK_SANITY (cr);
 }
@@ -368,7 +384,7 @@ cairo_set_source_rgba (cairo_t *cr,
 
     _cairo_color_init_rgba (&color, red, green, blue, alpha);
 
-    cr->status = _cairo_gstate_set_source_solid (cr->gstate, &color);
+    _cairo_set_source_solid (cr, &color);
     
     CAIRO_CHECK_SANITY (cr);
 }
diff --git a/src/cairoint.h b/src/cairoint.h
index 4098d3870..fae539f15 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -962,10 +962,6 @@ _cairo_gstate_get_target (cairo_gstate_t *gstate);
 cairo_private cairo_status_t
 _cairo_gstate_set_source (cairo_gstate_t *gstate, cairo_pattern_t *source);
 
-cairo_status_t
-_cairo_gstate_set_source_solid (cairo_gstate_t	    *gstate,
-				const cairo_color_t *color);
-
 cairo_private cairo_pattern_t *
 _cairo_gstate_get_source (cairo_gstate_t *gstate);