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

text bugfixes

Browse Source
This commit is contained in:
nulano 2020-04-14 10:07:28 +02:00
parent cee61d7622
commit e3450d1f6e
1 changed files with 62 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/_imagingft.c
View File

@ -655,27 +655,18 @@ font_getsize(FontObject* self, PyObject* args)
return geterror(error); return geterror(error);
} }
if (i == 0) {
// adjust start position if glyph bearing extends before origin
if (horizontal_dir) {
if (face->glyph->metrics.horiBearingX + glyph_info[i].x_offset < 0) {
x_min = position = face->glyph->metrics.horiBearingX +
glyph_info[i].x_offset;
}
} else {
if (face->glyph->metrics.vertBearingY + glyph_info[i].y_offset > 0) {
y_max = position = face->glyph->metrics.vertBearingY +
glyph_info[i].y_offset;
}
}
}
FT_Get_Glyph(face->glyph, &glyph); FT_Get_Glyph(face->glyph, &glyph);
FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_SUBPIXELS, &bbox); FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_SUBPIXELS, &bbox);
if (horizontal_dir) { if (horizontal_dir) {
// adjust start position if glyph bearing extends before origin
offset = position + face->glyph->metrics.horiBearingX + glyph_info[i].x_offset;
if (offset < x_min) {
x_min = offset;
}
position += glyph_info[i].x_advance; position += glyph_info[i].x_advance;
advanced = position; advanced = position;
// adjust glyph end position if bearing extends past advanced point // adjust glyph end position if bearing extends past advanced point
offset = glyph_info[i].x_advance - offset = glyph_info[i].x_advance -
glyph_info[i].x_offset - glyph_info[i].x_offset -
@ -697,13 +688,25 @@ font_getsize(FontObject* self, PyObject* args)
y_min = bbox.yMin; y_min = bbox.yMin;
} }
} else { } else {
position += glyph_info[i].y_advance; // NOTE: harfbuzz (called from raqm) assumes that we are using horizontal
// bearings even for vertical text and adjusts offsets to compensate as follows:
// hb-ft.cc: hb_ft_get_glyph_v_origin():
// x_offset += horiBearingX - vertBearingX;
// y_offset += horiBearingY - (-vertBearingY);
// adjust start position if glyph bearing extends before origin
offset = position + face->glyph->metrics.horiBearingY + glyph_info[i].y_offset;
if (offset > y_max) {
y_max = offset;
}
position += glyph_info[i].y_advance;
advanced = position; advanced = position;
// adjust glyph end position if bearing extends past advanced point // adjust glyph end position if bearing extends past advanced point
offset = glyph_info[i].y_advance - offset = glyph_info[i].y_advance -
glyph_info[i].y_offset - glyph_info[i].y_offset -
face->glyph->metrics.vertBearingY + face->glyph->metrics.horiBearingY +
face->glyph->metrics.height; face->glyph->metrics.height;
if (offset > 0) { if (offset > 0) {
advanced -= offset; advanced -= offset;
@ -732,7 +735,7 @@ font_getsize(FontObject* self, PyObject* args)
if (face) { if (face) {
if (horizontal_dir) { if (horizontal_dir) {
xoffset = x_min; xoffset = 0;
yoffset = self->face->size->metrics.ascender - y_max; yoffset = self->face->size->metrics.ascender - y_max;
} else { } else {
xoffset = 0; xoffset = 0;
@ -750,9 +753,9 @@ font_getsize(FontObject* self, PyObject* args)
static PyObject* static PyObject*
font_render(FontObject* self, PyObject* args) font_render(FontObject* self, PyObject* args)
{ {
int x, y; int x, y, baseline, offset;
Imaging im; Imaging im;
int index, error, baseline, horizontal_dir; int index, error, horizontal_dir;
int load_flags; int load_flags;
unsigned char *source; unsigned char *source;
FT_Glyph glyph; FT_Glyph glyph;
@ -805,7 +808,7 @@ font_render(FontObject* self, PyObject* args)
load_flags |= FT_LOAD_TARGET_MONO; load_flags |= FT_LOAD_TARGET_MONO;
} }
x = y = baseline = 0; x = y = baseline = offset = 0;
horizontal_dir = (dir && strcmp(dir, "ttb") == 0) ? 0 : 1; horizontal_dir = (dir && strcmp(dir, "ttb") == 0) ? 0 : 1;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
index = glyph_info[i].index; index = glyph_info[i].index;
@ -817,33 +820,44 @@ font_render(FontObject* self, PyObject* args)
glyph_slot = self->face->glyph; glyph_slot = self->face->glyph;
bitmap = glyph_slot->bitmap; bitmap = glyph_slot->bitmap;
// compute baseline and adjust start position if glyph bearing extends before origin
if (horizontal_dir) { if (horizontal_dir) {
temp = glyph_slot->metrics.horiBearingY + glyph_info[i].y_offset; temp = glyph_slot->metrics.horiBearingY + glyph_info[i].y_offset;
if (temp > baseline) { if (temp > baseline) {
baseline = temp; baseline = temp;
} }
if (i == 0) { temp = x + glyph_slot->metrics.horiBearingX + glyph_info[i].x_offset;
temp = glyph_slot->metrics.horiBearingX + glyph_info[i].x_offset; if (temp < offset) {
if (temp < 0) { offset = temp;
x = -temp;
}
} }
x += glyph_info[i].x_advance;
} else { } else {
temp = -(glyph_slot->metrics.vertBearingX + glyph_info[i].x_offset); // NOTE: harfbuzz (called from raqm) assumes that we are using horizontal
// bearings even for vertical text and adjusts offsets to compensate as follows:
// hb-ft.cc: hb_ft_get_glyph_v_origin():
// x_offset += horiBearingX - vertBearingX;
// y_offset += horiBearingY - (-vertBearingY);
temp = -(glyph_slot->metrics.horiBearingX + glyph_info[i].x_offset);
if (temp > baseline) { if (temp > baseline) {
baseline = temp; baseline = temp;
} }
if (i == 0) { temp = y + glyph_slot->metrics.horiBearingY + glyph_info[i].y_offset;
temp = glyph_slot->metrics.vertBearingY + glyph_info[i].y_offset; if (temp > offset) {
if (temp > 0) { offset = temp;
y = -temp;
}
} }
y += glyph_info[i].y_advance;
} }
} }
if (horizontal_dir) {
x = -offset;
} else {
y = -offset;
}
if (stroker == NULL) { if (stroker == NULL) {
load_flags |= FT_LOAD_RENDER; load_flags |= FT_LOAD_RENDER;
} }
@ -876,10 +890,15 @@ font_render(FontObject* self, PyObject* args)
bitmap = glyph_slot->bitmap; bitmap = glyph_slot->bitmap;
} }
// NOTE: harfbuzz (called from raqm) assumes that we are using horizontal
// bearings even for vertical text and adjusts offsets to compensate as follows:
// hb-ft.cc: hb_ft_get_glyph_v_origin():
// x_offset += horiBearingX - vertBearingX;
// y_offset += horiBearingY - (-vertBearingY);
if (horizontal_dir) { if (horizontal_dir) {
xx = PIXEL(x + glyph_slot->metrics.horiBearingX + glyph_info[i].x_offset) + stroke_width; xx = PIXEL(x + glyph_slot->metrics.horiBearingX + glyph_info[i].x_offset);
} else { } else {
xx = PIXEL(baseline + glyph_slot->metrics.vertBearingX + glyph_info[i].x_offset) + stroke_width; xx = PIXEL(baseline + glyph_slot->metrics.horiBearingX + glyph_info[i].x_offset);
} }
x0 = 0; x0 = 0;
@ -893,12 +912,15 @@ font_render(FontObject* self, PyObject* args)
source = (unsigned char*) bitmap.buffer; source = (unsigned char*) bitmap.buffer;
for (bitmap_y = 0; bitmap_y < bitmap.rows; bitmap_y++) { for (bitmap_y = 0; bitmap_y < bitmap.rows; bitmap_y++) {
// NOTE: harfbuzz (called from raqm) assumes that we are using horizontal
// bearings even for vertical text and adjusts offsets to compensate as follows:
// hb-ft.cc: hb_ft_get_glyph_v_origin():
// x_offset += horiBearingX - vertBearingX;
// y_offset += horiBearingY - (-vertBearingY);
if (horizontal_dir) { if (horizontal_dir) {
yy = PIXEL(baseline - glyph_slot->metrics.horiBearingY - glyph_info[i].y_offset) + yy = PIXEL(baseline - glyph_slot->metrics.horiBearingY - glyph_info[i].y_offset) + bitmap_y;
stroke_width + bitmap_y;
} else { } else {
yy = PIXEL(-(y + glyph_slot->metrics.vertBearingY + glyph_info[i].y_offset)) + yy = PIXEL(-(y + glyph_slot->metrics.horiBearingY + glyph_info[i].y_offset)) + bitmap_y;
stroke_width + bitmap_y;
} }
if (yy >= 0 && yy < im->ysize) { if (yy >= 0 && yy < im->ysize) {
// blend this glyph into the buffer // blend this glyph into the buffer