python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-10 19:56:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update gray glyph blending logic and tests

Browse Source
This commit is contained in:
ZachNagengast 2023-11-06 21:11:28 -08:00
parent e1aaec3fb1
commit fdecfca9f4
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/bitmap_font_stroke_basic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Tests/images/bitmap_font_stroke_raqm.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
Tests/images/default_font_freetype.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

25
src/_imagingft.c
View File

@ -1092,19 +1092,26 @@ font_render(FontObject *self, PyObject *args) {
if (color) { if (color) {
unsigned char *ink = (unsigned char *)&foreground_ink; unsigned char *ink = (unsigned char *)&foreground_ink;
for (k = x0; k < x1; k++) { for (k = x0; k < x1; k++) {
v = source[k] * convert_scale; int src_alpha = source[k] * convert_scale;
if (target[k * 4 + 3] < v) { if (src_alpha > 0) {
target[k * 4 + 0] = ink[0]; if (target[k * 4 + 3] > 0) {
target[k * 4 + 1] = ink[1]; target[k * 4 + 0] = BLEND(src_alpha, target[k * 4 + 0], ink[0], tmp);
target[k * 4 + 2] = ink[2]; target[k * 4 + 1] = BLEND(src_alpha, target[k * 4 + 1], ink[1], tmp);
target[k * 4 + 3] = v; target[k * 4 + 2] = BLEND(src_alpha, target[k * 4 + 2], ink[2], tmp);
target[k * 4 + 3] = CLIP8(src_alpha + MULDIV255(target[k * 4 + 3], (255 - src_alpha), tmp));
} else {
target[k * 4 + 0] = ink[0];
target[k * 4 + 1] = ink[1];
target[k * 4 + 2] = ink[2];
target[k * 4 + 3] = src_alpha;
}
} }
} }
} else { } else {
for (k = x0; k < x1; k++) { for (k = x0; k < x1; k++) {
v = source[k] * convert_scale; int src_alpha = source[k] * convert_scale;
if (target[k] < v) { if (src_alpha > 0) {
target[k] = v; target[k] = target[k] > 0 ? CLIP8(src_alpha + MULDIV255(target[k], (255 - src_alpha), tmp)) : src_alpha;
} }
} }
} }