fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 15:48:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove an unused field from cairo_xcb_shm_info_t

Browse source 
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2010-12-25 14:17:33 +01:00 • committed by M Joonas Pihlaja
parent c72c7aa6d6
commit 30b961f895
5 changed files with 33 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cairo-xcb-connection-shm.c
View file

@ -46,7 +46,7 @@ _cairo_xcb_connection_shm_attach (cairo_xcb_connection_t *connection,
return segment;
}
unsigned int
void
_cairo_xcb_connection_shm_put_image (cairo_xcb_connection_t *connection,
xcb_drawable_t dst,
xcb_gcontext_t gc,
@ -62,11 +62,9 @@ _cairo_xcb_connection_shm_put_image (cairo_xcb_connection_t *connection,
uint32_t shm,
uint32_t offset)
{
xcb_void_cookie_t cookie;
cookie = xcb_shm_put_image (connection->xcb_connection, dst, gc, total_width, total_height,
src_x, src_y, width, height, dst_x, dst_y, depth,
XCB_IMAGE_FORMAT_Z_PIXMAP, 0, shm, offset);
return cookie.sequence;
xcb_shm_put_image (connection->xcb_connection, dst, gc, total_width, total_height,
src_x, src_y, width, height, dst_x, dst_y, depth,
XCB_IMAGE_FORMAT_Z_PIXMAP, 0, shm, offset);
}
cairo_status_t

3
src/cairo-xcb-private.h
View file

@ -66,7 +66,6 @@ struct _cairo_xcb_shm_info {
cairo_xcb_connection_t *connection;
uint32_t shm;
uint32_t offset;
unsigned int seqno;
void *mem;
cairo_xcb_shm_mem_pool_t *pool;
};
@ -534,7 +533,7 @@ _cairo_xcb_connection_shm_attach (cairo_xcb_connection_t *connection,
uint32_t id,
cairo_bool_t readonly);
cairo_private unsigned int
cairo_private void
_cairo_xcb_connection_shm_put_image (cairo_xcb_connection_t *connection,
xcb_drawable_t dst,
xcb_gcontext_t gc,

19
src/cairo-xcb-surface-core.c
View file

@ -220,16 +220,15 @@ _pixmap_from_image (cairo_xcb_surface_t *target,
gc = _cairo_xcb_screen_get_gc (target->screen, pixmap->pixmap, image->depth);
if (shm_info != NULL) {
shm_info->seqno =
_cairo_xcb_connection_shm_put_image (target->connection,
pixmap->pixmap, gc,
image->width, image->height,
0, 0,
image->width, image->height,
0, 0,
image->depth,
shm_info->shm,
shm_info->offset);
_cairo_xcb_connection_shm_put_image (target->connection,
pixmap->pixmap, gc,
image->width, image->height,
0, 0,
image->width, image->height,
0, 0,
image->depth,
shm_info->shm,
shm_info->offset);
} else {
int len;

19
src/cairo-xcb-surface-render.c
View file

@ -328,16 +328,15 @@ _picture_from_image (cairo_xcb_surface_t *target,
gc = _cairo_xcb_screen_get_gc (target->screen, pixmap, image->depth);
if (shm_info != NULL) {
shm_info->seqno =
_cairo_xcb_connection_shm_put_image (target->connection,
pixmap, gc,
image->width, image->height,
0, 0,
image->width, image->height,
0, 0,
image->depth,
shm_info->shm,
shm_info->offset);
_cairo_xcb_connection_shm_put_image (target->connection,
pixmap, gc,
image->width, image->height,
0, 0,
image->width, image->height,
0, 0,
image->depth,
shm_info->shm,
shm_info->offset);
} else {
int len;

21
src/cairo-xcb-surface.c
View file

@ -608,17 +608,16 @@ _put_shm_image (cairo_xcb_surface_t *surface,
if (shm_info == NULL)
return CAIRO_INT_STATUS_UNSUPPORTED;
shm_info->seqno =
_cairo_xcb_connection_shm_put_image (surface->connection,
surface->drawable,
gc,
surface->width, surface->height,
0, 0,
image->width, image->height,
0, 0,
image->depth,
shm_info->shm,
shm_info->offset);
_cairo_xcb_connection_shm_put_image (surface->connection,
surface->drawable,
gc,
surface->width, surface->height,
0, 0,
image->width, image->height,
0, 0,
image->depth,
shm_info->shm,
shm_info->offset);
return CAIRO_STATUS_SUCCESS;
#else