highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-10 20:22:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better watermarking

Browse Source
This commit is contained in:
DarthSim
2019-08-28 17:08:53 +06:00
parent 5efed836dd
commit 8cef2ee3b2
5 changed files with 109 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
vips.c
View File

@@ -385,49 +385,6 @@ vips_ensure_alpha(VipsImage *in, VipsImage **out) {
return vips_bandjoin_const1(in, out, 255, NULL);
}
int
vips_apply_opacity(VipsImage *in, VipsImage **out, double opacity){
if (vips_image_hasalpha_go(in)) {
if (opacity < 1) {
VipsImage *img, *img_alpha, *tmp;
if (vips_extract_band(in, &img, 0, "n", in->Bands - 1, NULL))
return 1;
if (vips_extract_band(in, &img_alpha, in->Bands - 1, "n", 1, NULL)) {
clear_image(&img);
return 1;
}
if (vips_linear1(img_alpha, &tmp, opacity, 0, NULL)) {
clear_image(&img);
clear_image(&img_alpha);
return 1;
}
swap_and_clear(&img_alpha, tmp);
if (vips_bandjoin2(img, img_alpha, out, NULL)) {
clear_image(&img);
clear_image(&img_alpha);
return 1;
}
clear_image(&img);
clear_image(&img_alpha);
} else {
if (vips_copy(in, out, NULL)) {
return 1;
}
}
} else {
if (vips_bandjoin_const1(in, out, opacity * 255, NULL)) {
return 1;
}
}
return 0;
}
int
vips_apply_watermark(VipsImage *in, VipsImage *watermark, VipsImage **out, double opacity) {
VipsImage *wm, *wm_alpha, *tmp;