go/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-02-07 11:36:25 +02:00
Code Releases Activity

Remove alpha after watermarking if image hadn't one before

Browse Source
This commit is contained in:
DarthSim 2022-09-30 18:09:07 +06:00
parent dda20f1a1d
commit e233a60f6c
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vips/vips.c
View File

@ -530,7 +530,7 @@ vips_embed_go(VipsImage *in, VipsImage **out, int x, int y, int width, int heigh
int int
vips_apply_watermark(VipsImage *in, VipsImage *watermark, VipsImage **out, double opacity) { vips_apply_watermark(VipsImage *in, VipsImage *watermark, VipsImage **out, double opacity) {
VipsImage *base = vips_image_new(); VipsImage *base = vips_image_new();
VipsImage **t = (VipsImage **) vips_object_local_array(VIPS_OBJECT(base), 6); VipsImage **t = (VipsImage **) vips_object_local_array(VIPS_OBJECT(base), 7);
if (!vips_image_hasalpha(watermark)) { if (!vips_image_hasalpha(watermark)) {
if (vips_bandjoin_const1(watermark, &t[0], 255, NULL)) if (vips_bandjoin_const1(watermark, &t[0], 255, NULL))
@ -553,9 +553,23 @@ vips_apply_watermark(VipsImage *in, VipsImage *watermark, VipsImage **out, doubl
watermark = t[4]; watermark = t[4];
} }
int res = int had_alpha = vips_image_hasalpha(in);
if (
vips_composite2(in, watermark, &t[5], VIPS_BLEND_MODE_OVER, "compositing_space", in->Type, NULL) || vips_composite2(in, watermark, &t[5], VIPS_BLEND_MODE_OVER, "compositing_space", in->Type, NULL) ||
vips_cast(t[5], out, vips_image_get_format(in), NULL); vips_cast(t[5], &t[6], vips_image_get_format(in), NULL)
) {
clear_image(&base);
return 1;
}
int res;
if (!had_alpha && vips_image_hasalpha(t[6])) {
res = vips_extract_band(t[6], out, 0, "n", t[6]->Bands - 1, NULL);
} else {
res = vips_copy(t[6], out, NULL);
}
clear_image(&base); clear_image(&base);