diff options
| -rw-r--r-- | src/cairo-color.c | 13 | ||||
| -rw-r--r-- | src/cairoint.h | 7 | ||||
| -rw-r--r-- | src/drm/cairo-drm-xr.c | 9 |
3 files changed, 5 insertions, 24 deletions
diff --git a/src/cairo-color.c b/src/cairo-color.c index d20fea4d..9c852559 100644 --- a/src/cairo-color.c +++ b/src/cairo-color.c @@ -77,19 +77,6 @@ _cairo_stock_color (cairo_stock_t stock) } } -void -_cairo_color_init (cairo_color_t *color) -{ - *color = cairo_color_white; -} - -void -_cairo_color_init_rgb (cairo_color_t *color, - double red, double green, double blue) -{ - _cairo_color_init_rgba (color, red, green, blue, 1.0); -} - /* Convert a double in [0.0, 1.0] to an integer in [0, 65535] * The conversion is designed to divide the input range into 65536 * equally-sized regions. This is achieved by multiplying by 65536 and diff --git a/src/cairoint.h b/src/cairoint.h index 121676ca..3ab77016 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -1043,13 +1043,6 @@ cairo_private uint16_t _cairo_color_double_to_short (double d) cairo_const; cairo_private void -_cairo_color_init (cairo_color_t *color); - -cairo_private void -_cairo_color_init_rgb (cairo_color_t *color, - double red, double green, double blue); - -cairo_private void _cairo_color_init_rgba (cairo_color_t *color, double red, double green, double blue, double alpha); diff --git a/src/drm/cairo-drm-xr.c b/src/drm/cairo-drm-xr.c index c3b1bbdc..49d17280 100644 --- a/src/drm/cairo-drm-xr.c +++ b/src/drm/cairo-drm-xr.c @@ -669,10 +669,11 @@ xr_poly_fill_rect (DrawablePtr drawable, } } - _cairo_color_init_rgb (&color, - ((gc->fgPixel & 0x00ff0000) >> 16) / 255., - ((gc->fgPixel & 0x0000ff00) >> 8) / 255., - ((gc->fgPixel & 0x000000ff) >> 0) / 255.); + _cairo_color_init_rgba (&color, + ((gc->fgPixel & 0x00ff0000) >> 16) / 255., + ((gc->fgPixel & 0x0000ff00) >> 8) / 255., + ((gc->fgPixel & 0x000000ff) >> 0) / 255., + 1.0); _cairo_pattern_init_solid (&pattern, &color, CAIRO_CONTENT_COLOR); status = _cairo_surface_fill (surface, |