python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-21 13:39:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Blend colors with alpha when pasting

Browse Source 
- Previously took the highest alpha as threshold
This commit is contained in:
ZachNagengast 2023-10-26 21:40:41 -07:00
parent 57c72b6e00
commit f97570f523
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/_imagingft.c
View File

@ -1059,16 +1059,25 @@ font_render(FontObject *self, PyObject *args) {
if (color && bitmap.pixel_mode == FT_PIXEL_MODE_BGRA) { if (color && bitmap.pixel_mode == FT_PIXEL_MODE_BGRA) {
/* paste color glyph */ /* paste color glyph */
for (k = x0; k < x1; k++) { for (k = x0; k < x1; k++) {
if (target[k * 4 + 3] < source[k * 4 + 3]) { float src_alpha = (float) source[k * 4 + 3] / 255.0;
/* unpremultiply BGRa to RGBA */ float dst_alpha = (float) target[k * 4 + 3] / 255.0;
target[k * 4 + 0] = CLIP8( float out_alpha = src_alpha + dst_alpha * (1.0 - src_alpha);
(255 * (int)source[k * 4 + 2]) / source[k * 4 + 3]);
target[k * 4 + 1] = CLIP8( /* unpremultiply BGRa to RGBA */
(255 * (int)source[k * 4 + 1]) / source[k * 4 + 3]); int src_red = source[k * 4 + 0];
target[k * 4 + 2] = CLIP8( int src_grn = source[k * 4 + 1];
(255 * (int)source[k * 4 + 0]) / source[k * 4 + 3]); int src_blu = source[k * 4 + 2];
target[k * 4 + 3] = source[k * 4 + 3];
} int dst_blu = target[k * 4 + 0];
int dst_grn = target[k * 4 + 1];
int dst_red = target[k * 4 + 2];
/* blend color values */
target[k * 4 + 0] = CLIP8((src_blu * src_alpha + dst_blu * dst_alpha * (1.0 - src_alpha)) / out_alpha);
target[k * 4 + 1] = CLIP8((src_grn * src_alpha + dst_grn * dst_alpha * (1.0 - src_alpha)) / out_alpha);
target[k * 4 + 2] = CLIP8((src_red * src_alpha + dst_red * dst_alpha * (1.0 - src_alpha)) / out_alpha);
target[k * 4 + 3] = CLIP8(out_alpha * 255.0);
} }
} else if (bitmap.pixel_mode == FT_PIXEL_MODE_GRAY) { } else if (bitmap.pixel_mode == FT_PIXEL_MODE_GRAY) {
if (color) { if (color) {