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

Convert XCreate{Pix,Bit}map...Data to use C99 designated initializers

Browse source 
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2012-06-29 23:08:04 -07:00
parent 0dc93f7e43
commit 65358ea507
2 changed files with 44 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/CrBFData.c
View file

@ -53,30 +53,28 @@ Pixmap XCreateBitmapFromData(
unsigned int width,
unsigned int height)
{
XImage ximage;
GC gc;
Pixmap pix;
pix = XCreatePixmap(display, d, width, height, 1);
gc = XCreateGC(display, pix, (unsigned long) 0, (XGCValues *) 0);
Pixmap pix = XCreatePixmap(display, d, width, height, 1);
GC gc = XCreateGC(display, pix, (unsigned long) 0, (XGCValues *) 0);
if (gc == NULL) {
XFreePixmap(display, pix);
return (Pixmap) None;
} else {
XImage ximage = {
.height = height,
.width = width,
.depth = 1,
.bits_per_pixel = 1,
.xoffset = 0,
.format = XYPixmap,
.data = (char *) data,
.byte_order = LSBFirst,
.bitmap_unit = 8,
.bitmap_bit_order = LSBFirst,
.bitmap_pad = 8,
.bytes_per_line = (width + 7) / 8,
};
XPutImage(display, pix, gc, &ximage, 0, 0, 0, 0, width, height);
XFreeGC(display, gc);
return(pix);
}
ximage.height = height;
ximage.width = width;
ximage.depth = 1;
ximage.bits_per_pixel = 1;
ximage.xoffset = 0;
ximage.format = XYPixmap;
ximage.data = (char *)data;
ximage.byte_order = LSBFirst;
ximage.bitmap_unit = 8;
ximage.bitmap_bit_order = LSBFirst;
ximage.bitmap_pad = 8;
ximage.bytes_per_line = (width+7)/8;
XPutImage(display, pix, gc, &ximage, 0, 0, 0, 0, width, height);
XFreeGC(display, gc);
return(pix);
}

49
src/CrPFBData.c
View file

@ -58,33 +58,32 @@ Pixmap XCreatePixmapFromBitmapData(
unsigned long bg,
unsigned int depth)
{
XImage ximage;
GC gc;
XGCValues gcv;
Pixmap pix;
pix = XCreatePixmap(display, d, width, height, depth);
gcv.foreground = fg;
gcv.background = bg;
gc = XCreateGC(display, pix, GCForeground|GCBackground, &gcv);
Pixmap pix = XCreatePixmap(display, d, width, height, depth);
XGCValues gcv = {
.foreground = fg,
.background = bg
};
GC gc = XCreateGC(display, pix, GCForeground|GCBackground, &gcv);
if (gc == NULL) {
XFreePixmap(display, pix);
return (Pixmap) None;
} else {
XImage ximage = {
.height = height,
.width = width,
.depth = 1,
.bits_per_pixel = 1,
.xoffset = 0,
.format = XYBitmap,
.data = data,
.byte_order = LSBFirst,
.bitmap_unit = 8,
.bitmap_bit_order = LSBFirst,
.bitmap_pad = 8,
.bytes_per_line = (width + 7) / 8
};
XPutImage(display, pix, gc, &ximage, 0, 0, 0, 0, width, height);
XFreeGC(display, gc);
return(pix);
}
ximage.height = height;
ximage.width = width;
ximage.depth = 1;
ximage.bits_per_pixel = 1;
ximage.xoffset = 0;
ximage.format = XYBitmap;
ximage.data = data;
ximage.byte_order = LSBFirst;
ximage.bitmap_unit = 8;
ximage.bitmap_bit_order = LSBFirst;
ximage.bitmap_pad = 8;
ximage.bytes_per_line = (width+7)/8;
XPutImage(display, pix, gc, &ximage, 0, 0, 0, 0, width, height);
XFreeGC(display, gc);
return(pix);
}