mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-02-21 07:30:35 +01:00
Remove deprecated cairo_get_rgb_color that was accidentally missed in the recent purge of deprecated functions.
This commit is contained in:
parent
4fff218fc4
commit
9939e01b69
6 changed files with 9 additions and 63 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2005-05-07 Carl Worth <cworth@cworth.org>
|
||||
|
||||
* 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.
|
||||
|
||||
2005-05-07 Carl Worth <cworth@cworth.org>
|
||||
|
||||
* src/cairo-xcb-surface.c (_render_operator):
|
||||
|
|
|
|||
|
|
@ -436,12 +436,6 @@ _cairo_gstate_get_operator (cairo_gstate_t *gstate)
|
|||
return gstate->operator;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -413,25 +413,6 @@ cairo_pattern_get_extend (cairo_pattern_t *pattern)
|
|||
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)
|
||||
|
|
|
|||
25
src/cairo.c
25
src/cairo.c
|
|
@ -1867,31 +1867,6 @@ cairo_get_operator (cairo_t *cr)
|
|||
return _cairo_gstate_get_operator (cr->gstate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
|
|
|
|||
|
|
@ -737,9 +737,6 @@ cairo_scaled_font_glyph_extents (cairo_scaled_font_t *scaled_font,
|
|||
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);
|
||||
|
||||
|
|
|
|||
|
|
@ -973,12 +973,6 @@ _cairo_gstate_set_operator (cairo_gstate_t *gstate, cairo_operator_t operator);
|
|||
cairo_private cairo_operator_t
|
||||
_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);
|
||||
|
||||
|
|
@ -1716,10 +1710,6 @@ _cairo_pattern_fini (cairo_pattern_t *pattern);
|
|||
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);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue