guijan
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: Tweak/correct error handling in drawable grabbing functions 

imlib_create_scaled_image_from_drawable() now returns NULL if the
drawable could not be grabbed, just as imlib_create_image_from_drawable()
has always done.
This commit is contained in:
Kim Woelders 2023-01-13 15:48:26 +01:00
parent dafd7eb33d
commit 5d16eb8bb8
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/lib/api_x11.c
View File

@ -304,20 +304,19 @@ imlib_create_image_from_drawable(Pixmap mask, int x, int y, int width,
if (!im)
return NULL;
im->data = malloc(width * height * sizeof(uint32_t));
if (im->data &&
__imlib_GrabDrawableToRGBA(im->data, 0, 0, width, height, ctx->display,
ctx->drawable, mask, ctx->visual,
ctx->colormap, ctx->depth, x, y, width,
height, &domask, need_to_grab_x))
{
im->has_alpha = domask;
}
else
if (!im->data ||
!__imlib_GrabDrawableToRGBA(im->data, 0, 0, width, height, ctx->display,
ctx->drawable, mask, ctx->visual,
ctx->colormap, ctx->depth, x, y, width,
height, &domask, need_to_grab_x))
{
__imlib_FreeImage(im);
im = NULL;
return NULL;
}
im->has_alpha = domask;
return im;
}
@ -359,8 +358,6 @@ imlib_create_scaled_image_from_drawable(Pixmap mask, int src_x, int src_y,
if (!IMAGE_DIMENSIONS_OK(dst_width, dst_height))
return NULL;
domask = mask != 0 || get_mask_from_shape;
im = __imlib_CreateImage(dst_width, dst_height, NULL);
if (!im)
return NULL;
@ -371,11 +368,18 @@ imlib_create_scaled_image_from_drawable(Pixmap mask, int src_x, int src_y,
return NULL;
}
__imlib_GrabDrawableScaledToRGBA(im->data, 0, 0, dst_width, dst_height,
ctx->display, ctx->drawable, mask,
ctx->visual, ctx->colormap, ctx->depth,
src_x, src_y, src_width, src_height,
&domask, need_to_grab_x);
domask = mask != 0 || get_mask_from_shape;
if (!im->data ||
!__imlib_GrabDrawableScaledToRGBA(im->data, 0, 0, dst_width, dst_height,
ctx->display, ctx->drawable, mask,
ctx->visual, ctx->colormap, ctx->depth,
src_x, src_y, src_width, src_height,
&domask, need_to_grab_x))
{
__imlib_FreeImage(im);
return NULL;
}
im->has_alpha = domask;