gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

fix from Pascal and Alban

Browse Source
This commit is contained in:
id
2000-12-17 13:56:14 +00:00
parent e541b9433b
commit 163e70bdae
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wrlib/xpixmap.c
View File

@@ -106,6 +106,8 @@ RCreateImageFromXImage(RContext *context, XImage *image, XImage *mask)
*data++ = 0xff; *data++ = 0xff;
*data++ = 0xff; *data++ = 0xff;
} }
if (mask)
*data++ = 0;
} }
} }
} else { } else {
@@ -115,16 +117,22 @@ RCreateImageFromXImage(RContext *context, XImage *image, XImage *mask)
*(data++) = NORMALIZE_RED(pixel); *(data++) = NORMALIZE_RED(pixel);
*(data++) = NORMALIZE_GREEN(pixel); *(data++) = NORMALIZE_GREEN(pixel);
*(data++) = NORMALIZE_BLUE(pixel); *(data++) = NORMALIZE_BLUE(pixel);
if (mask)
*(data++) = 0;
} }
} }
} }
data = img->data;
#define MIN(a,b) ((a)<(b)?(a):(b)) #define MIN(a,b) ((a)<(b)?(a):(b))
if (mask) { if (mask) {
for (y = 0; y < MIN(mask->height, image->height); y++) { for (y = 0; y < MIN(mask->height, image->height); y++) {
for (x = 0; x < MIN(mask->width, image->width); x++) { for (x = 0; x < image->width; x++) {
if (XGetPixel(mask, x, y)) {
data += 3; /* Skip R, G & B */
if (mask->width <= image->width && XGetPixel(mask, x, y)) {
*(data++) = 0xff; *(data++) = 0xff;
} else { } else {
*(data++) = 0; *(data++) = 0;