[cairo-commit] cairo/src cairo-gstate.c, 1.124, 1.125 cairo-pattern.c, 1.35, 1.36 cairo.c, 1.89, 1.90 cairo.h, 1.113, 1.114 cairoint.h, 1.135, 1.136

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-gstate.c cairo-pattern.c cairo.c cairo.h cairoint.h 
Log Message:

        * src/cairo-gstate.c:
        * src/cairo-pattern.c:
        * src/cairo.c:
        * src/cairo.h:
        * src/cairoint.h: Remove deprecated cairo_get_rgb_color that was
        accidentally missed in the recent purge of deprecated functions.


Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- cairo-gstate.c	7 May 2005 04:19:50 -0000	1.124
+++ cairo-gstate.c	7 May 2005 04:25:56 -0000	1.125
@@ -437,12 +437,6 @@
 }
 
 cairo_status_t
-_cairo_gstate_get_rgb_color (cairo_gstate_t *gstate, double *red, double *green, double *blue)
-{
-    return _cairo_pattern_get_rgb (gstate->source, red, green, blue);
-}
-
-cairo_status_t
 _cairo_gstate_set_tolerance (cairo_gstate_t *gstate, double tolerance)
 {
     gstate->tolerance = tolerance;

Index: cairo-pattern.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-pattern.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- cairo-pattern.c	6 May 2005 20:32:53 -0000	1.35
+++ cairo-pattern.c	7 May 2005 04:25:56 -0000	1.36
@@ -413,25 +413,6 @@
     return pattern->extend;
 }
 
-cairo_status_t
-_cairo_pattern_get_rgb (cairo_pattern_t *pattern,
-			double		*red,
-			double		*green,
-			double		*blue)
-{
-    if (pattern->type == CAIRO_PATTERN_SOLID)
-    {
-	double alpha_unused;
-	cairo_solid_pattern_t *solid = (cairo_solid_pattern_t *) pattern;
-
-	_cairo_color_get_rgba (&solid->color, red, green, blue, &alpha_unused);
-    } else {
-	*red = *green = *blue = 1.0;
-    }
-
-    return CAIRO_STATUS_SUCCESS;
-}
-
 void
 _cairo_pattern_transform (cairo_pattern_t *pattern,
 			  cairo_matrix_t  *ctm_inverse)

Index: cairo.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- cairo.c	6 May 2005 20:32:53 -0000	1.89
+++ cairo.c	7 May 2005 04:25:56 -0000	1.90
@@ -1868,31 +1868,6 @@
 }
 
 /**
- * cairo_get_rgb_color:
- * @cr: a cairo context
- * @red: return value for red channel
- * @green: return value for green channel
- * @blue: return value for blue channel
- * 
- * Gets the current color for a cairo context, as set by
- * cairo_set_rgb_color().
- *
- * Note that this color may not actually be used for drawing
- * operations, (in the case of an alternate source pattern being set
- * by cairo_set_pattern()).
- *
- * WARNING: This function is deprecated and scheduled to be removed as
- * part of the upcoming API Shakeup.
- **/
-void
-cairo_get_rgb_color (cairo_t *cr, double *red, double *green, double *blue)
-{
-    CAIRO_CHECK_SANITY (cr);
-    _cairo_gstate_get_rgb_color (cr->gstate, red, green, blue);
-    CAIRO_CHECK_SANITY (cr);
-}
-
-/**
  * cairo_get_tolerance:
  * @cr: a cairo context
  * 

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- cairo.h	6 May 2005 20:32:53 -0000	1.113
+++ cairo.h	7 May 2005 04:25:56 -0000	1.114
@@ -737,9 +737,6 @@
 cairo_operator_t
 cairo_get_operator (cairo_t *cr);
 
-void
-cairo_get_rgb_color (cairo_t *cr, double *red, double *green, double *blue);
-
 cairo_pattern_t *
 cairo_get_source (cairo_t *cr);
 

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- cairoint.h	6 May 2005 20:32:53 -0000	1.135
+++ cairoint.h	7 May 2005 04:25:56 -0000	1.136
@@ -974,12 +974,6 @@
 _cairo_gstate_get_operator (cairo_gstate_t *gstate);
 
 cairo_private cairo_status_t
-_cairo_gstate_get_rgb_color (cairo_gstate_t *gstate,
-				 double *red,
-				 double *green,
-				 double *blue);
-
-cairo_private cairo_status_t
 _cairo_gstate_set_tolerance (cairo_gstate_t *gstate, double tolerance);
 
 cairo_private double
@@ -1716,10 +1710,6 @@
 cairo_private cairo_pattern_t *
 _cairo_pattern_create_solid (const cairo_color_t *color);
 
-cairo_private cairo_status_t
-_cairo_pattern_get_rgb (cairo_pattern_t *pattern,
-			double *red, double *green, double *blue);
-
 cairo_private void
 _cairo_pattern_transform (cairo_pattern_t *pattern,
 			  cairo_matrix_t *ctm_inverse);