diff options
| author | Jamey Sharp <jamey@minilop.net> | 2006-04-27 10:35:54 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2006-04-27 10:35:54 -0700 |
| commit | 7591cce82d169306657fc9465d8ff5919aa38e99 (patch) | |
| tree | c08b22e4859fb4871576192519522a4abb7736c5 /image | |
| parent | eea88fd19ac02db817faf333acb1b7a321553a70 (diff) | |
Update xcb-util for ConnSetup renaming and constness fixes.
Diffstat (limited to 'image')
| -rw-r--r-- | image/xcb_image.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/image/xcb_image.c b/image/xcb_image.c index 40e4b2a..43906cb 100644 --- a/image/xcb_image.c +++ b/image/xcb_image.c @@ -36,8 +36,8 @@ static unsigned int Ones( /* HACKMEM 169 */ static CARD8 xcb_bits_per_pixel (XCBConnection *c, CARD8 depth) { - XCBFORMAT *fmt = XCBConnSetupSuccessRepPixmapFormats(XCBGetSetup(c)); - XCBFORMAT *fmtend = fmt + XCBConnSetupSuccessRepPixmapFormatsLength(XCBGetSetup(c)); + XCBFORMAT *fmt = XCBSetupPixmapFormats(XCBGetSetup(c)); + XCBFORMAT *fmtend = fmt + XCBSetupPixmapFormatsLength(XCBGetSetup(c)); for(; fmt != fmtend; ++fmt) if(fmt->depth == depth) @@ -62,8 +62,8 @@ static CARD8 xcb_scanline_pad_get (XCBConnection *conn, CARD8 depth) { - XCBFORMAT *fmt = XCBConnSetupSuccessRepPixmapFormats(XCBGetSetup(conn)); - XCBFORMAT *fmtend = fmt + XCBConnSetupSuccessRepPixmapFormatsLength(XCBGetSetup(conn)); + XCBFORMAT *fmt = XCBSetupPixmapFormats(XCBGetSetup(conn)); + XCBFORMAT *fmtend = fmt + XCBSetupPixmapFormatsLength(XCBGetSetup(conn)); for(; fmt != fmtend; ++fmt) if(fmt->depth == depth) @@ -105,9 +105,9 @@ XCBImageCreate (XCBConnection *conn, CARD8 xpad, CARD32 bytes_per_line) { - XCBImage *image; - XCBConnSetupSuccessRep *rep; - CARD8 bpp = 1; /* bits per pixel */ + XCBImage *image; + const XCBSetup *rep; + CARD8 bpp = 1; /* bits per pixel */ if (format_invalid(depth, format, xpad)) return (XCBImage *) NULL; @@ -308,7 +308,7 @@ XCBImagePut (XCBConnection *conn, dest_bits_per_pixel = image->bits_per_pixel; dest_scanline_pad = image->bitmap_format_scanline_pad; left_pad = 0; - iter = XCBConnSetupSuccessRepPixmapFormatsIter (XCBGetSetup (conn)); + iter = XCBSetupPixmapFormatsIter (XCBGetSetup (conn)); for (; iter.rem ; XCBFORMATNext (&iter)) if (iter.data->depth == image->depth) { @@ -319,7 +319,7 @@ XCBImagePut (XCBConnection *conn, if (dest_bits_per_pixel != image->bits_per_pixel) { XCBImage img; register INT32 i, j; - XCBConnSetupSuccessRep *rep; + const XCBSetup *rep; /* XXX slow, but works */ rep = XCBGetSetup (conn); @@ -382,8 +382,8 @@ XCBImageSHMCreate (XCBConnection *conn, CARD16 width, CARD16 height) { - XCBImage *image; - XCBConnSetupSuccessRep *rep; + XCBImage *image; + const XCBSetup *rep; image = (XCBImage *)malloc (sizeof (XCBImage)); if (!image) |