diff options
author | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
commit | bd13c464f728719fceb8a4918b52727ec125ea6e (patch) | |
tree | 05a48375076036097a9e28356738c05a16cc5ed0 /pixman/pixman/pixman.h | |
parent | bab6395ded69210cbc550c0fb3765160e4405283 (diff) | |
parent | 0130346adbce7e6b2422429887fc46c76806d845 (diff) | |
download | vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.gz vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.bz2 vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
randrproto mesa pixman git update 4 oct 2012
Diffstat (limited to 'pixman/pixman/pixman.h')
-rw-r--r-- | pixman/pixman/pixman.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pixman/pixman/pixman.h b/pixman/pixman/pixman.h index e1cb90a7d..1dc167a7a 100644 --- a/pixman/pixman/pixman.h +++ b/pixman/pixman/pixman.h @@ -737,18 +737,18 @@ pixman_bool_t pixman_format_supported_destination (pixman_format_code_t format); pixman_bool_t pixman_format_supported_source (pixman_format_code_t format); /* Constructors */ -pixman_image_t *pixman_image_create_solid_fill (pixman_color_t *color); -pixman_image_t *pixman_image_create_linear_gradient (pixman_point_fixed_t *p1, - pixman_point_fixed_t *p2, +pixman_image_t *pixman_image_create_solid_fill (const pixman_color_t *color); +pixman_image_t *pixman_image_create_linear_gradient (const pixman_point_fixed_t *p1, + const pixman_point_fixed_t *p2, const pixman_gradient_stop_t *stops, int n_stops); -pixman_image_t *pixman_image_create_radial_gradient (pixman_point_fixed_t *inner, - pixman_point_fixed_t *outer, +pixman_image_t *pixman_image_create_radial_gradient (const pixman_point_fixed_t *inner, + const pixman_point_fixed_t *outer, pixman_fixed_t inner_radius, pixman_fixed_t outer_radius, const pixman_gradient_stop_t *stops, int n_stops); -pixman_image_t *pixman_image_create_conical_gradient (pixman_point_fixed_t *center, +pixman_image_t *pixman_image_create_conical_gradient (const pixman_point_fixed_t *center, pixman_fixed_t angle, const pixman_gradient_stop_t *stops, int n_stops); @@ -804,12 +804,12 @@ int pixman_image_get_depth (pixman_image_t *image); pixman_format_code_t pixman_image_get_format (pixman_image_t *image); pixman_bool_t pixman_image_fill_rectangles (pixman_op_t op, pixman_image_t *image, - pixman_color_t *color, + const pixman_color_t *color, int n_rects, const pixman_rectangle16_t *rects); pixman_bool_t pixman_image_fill_boxes (pixman_op_t op, pixman_image_t *dest, - pixman_color_t *color, + const pixman_color_t *color, int n_boxes, const pixman_box32_t *boxes); @@ -903,7 +903,7 @@ void pixman_glyph_get_extents (pixman_glyph_cache_t *cac pixman_box32_t *extents); pixman_format_code_t pixman_glyph_get_mask_format (pixman_glyph_cache_t *cache, int n_glyphs, - pixman_glyph_t * glyphs); + const pixman_glyph_t *glyphs); void pixman_composite_glyphs (pixman_op_t op, pixman_image_t *src, pixman_image_t *dest, @@ -918,7 +918,7 @@ void pixman_composite_glyphs (pixman_op_t op, int32_t height, pixman_glyph_cache_t *cache, int n_glyphs, - pixman_glyph_t *glyphs); + const pixman_glyph_t *glyphs); void pixman_composite_glyphs_no_mask (pixman_op_t op, pixman_image_t *src, pixman_image_t *dest, @@ -928,7 +928,7 @@ void pixman_composite_glyphs_no_mask (pixman_op_t op, int32_t dest_y, pixman_glyph_cache_t *cache, int n_glyphs, - pixman_glyph_t *glyphs); + const pixman_glyph_t *glyphs); /* * Trapezoids @@ -1014,7 +1014,7 @@ void pixman_add_traps (pixman_image_t *image, int16_t x_off, int16_t y_off, int ntrap, - pixman_trap_t *traps); + const pixman_trap_t *traps); void pixman_add_trapezoids (pixman_image_t *image, int16_t x_off, int y_off, |