old
/
legacy-imlib2
3
0
Fork 4
Code Issues 3 Pull Requests Projects Releases Wiki Activity

api: Fix code duplication around some __imlib_BlendImageToImage() calls

This commit is contained in:
Kim Woelders 2023-01-13 08:32:39 +01:00
parent 207cffb207
commit a4e240bc96
1 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/lib/api.c
View File

@ -1047,23 +1047,14 @@ imlib_create_cropped_image(int x, int y, int width, int height)
__imlib_FreeImage(im);
return NULL;
}
if (im_old->has_alpha)
{
im->has_alpha = 1;
__imlib_BlendImageToImage(im_old, im, 0, 0, 1, x, y, abs(width),
abs(height), 0, 0, width, height, NULL,
(ImlibOp) IMLIB_OP_COPY,
ctx->cliprect.x, ctx->cliprect.y,
ctx->cliprect.w, ctx->cliprect.h);
}
else
{
__imlib_BlendImageToImage(im_old, im, 0, 0, 0, x, y, abs(width),
abs(height), 0, 0, width, height, NULL,
(ImlibOp) IMLIB_OP_COPY,
ctx->cliprect.x, ctx->cliprect.y,
ctx->cliprect.w, ctx->cliprect.h);
}
im->has_alpha = im_old->has_alpha;
__imlib_BlendImageToImage(im_old, im, 0, 0, im->has_alpha,
x, y, abs(width), abs(height), 0, 0, width, height,
NULL, (ImlibOp) IMLIB_OP_COPY,
ctx->cliprect.x, ctx->cliprect.y,
ctx->cliprect.w, ctx->cliprect.h);
return im;
}
@ -1089,25 +1080,15 @@ imlib_create_cropped_scaled_image(int source_x, int source_y,
__imlib_FreeImage(im);
return NULL;
}
if (im_old->has_alpha)
{
im->has_alpha = 1;
__imlib_BlendImageToImage(im_old, im, ctx->anti_alias, 0, 1, source_x,
source_y, source_width, source_height, 0, 0,
destination_width, destination_height, NULL,
(ImlibOp) IMLIB_OP_COPY,
ctx->cliprect.x, ctx->cliprect.y,
ctx->cliprect.w, ctx->cliprect.h);
}
else
{
__imlib_BlendImageToImage(im_old, im, ctx->anti_alias, 0, 0, source_x,
source_y, source_width, source_height, 0, 0,
destination_width, destination_height, NULL,
(ImlibOp) IMLIB_OP_COPY,
ctx->cliprect.x, ctx->cliprect.y,
ctx->cliprect.w, ctx->cliprect.h);
}
im->has_alpha = im_old->has_alpha;
__imlib_BlendImageToImage(im_old, im, ctx->anti_alias, 0, im->has_alpha,
source_x, source_y, source_width, source_height,
0, 0, destination_width, destination_height,
NULL, (ImlibOp) IMLIB_OP_COPY,
ctx->cliprect.x, ctx->cliprect.y,
ctx->cliprect.w, ctx->cliprect.h);
return im;
}