python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-03 12:00:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix Raqm fallback for first codepoint, use first font's missing glyph instead of last font's missing glyph

Browse Source
This commit is contained in:
nulano 2023-02-02 15:55:42 +00:00 committed by Nulano
parent c244169a8e
commit cbbd9bd27d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/_imagingft.c
View File

@ -463,7 +463,7 @@ text_layout_raqm(
}
}
for (face = 0; face < family->font_count; face++) {
for (face = 0; ; face++) {
#ifdef RAQM_VERSION_ATLEAST
#if RAQM_VERSION_ATLEAST(0, 9, 0)
if (face >= 1) {
@ -544,7 +544,9 @@ text_layout_raqm(
}
} else {
start = 0;
for (i = 0; i <= size; i++) {
/* use first font's missing glyph */
int f = face < family->font_count ? face : 0;
for (i = 1; i <= size; i++) {
if (i < size) {
if (fallback[i] == -2) {
/* not a cluster boundary */
@ -557,7 +559,7 @@ text_layout_raqm(
}
if (fallback[start] < 0) {
raqm_set_freetype_face_range(
rq, family->faces[face], start, i - start);
rq, family->faces[f], start, i - start);
} else {
raqm_set_freetype_face_range(
rq, family->faces[fallback[start]], start, i - start);
@ -578,14 +580,11 @@ text_layout_raqm(
goto failed;
}
//if (face + 1 == family->font_count) {
// break;
//}
if (family->font_count == 1) {
if (family->font_count == 1 || face == family->font_count) {
break;
}
for (i = 1; i < size; i++) {
for (i = 0; i < size; i++) {
if (fallback[i] == -1) {
fallback[i] = -2;
}
@ -603,7 +602,6 @@ text_layout_raqm(
fallback[cluster] = face;
}
}
if (!missing) {
break;
}