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

add brackets

Browse Source
This commit is contained in:
nulano 2020-07-22 21:53:19 +02:00
parent bbcb9483ed
commit b3f5c76742
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/_imagingft.c
View File

@ -729,23 +729,28 @@ font_getsize(FontObject* self, PyObject* args)
load_flags |= FT_LOAD_TARGET_MONO; load_flags |= FT_LOAD_TARGET_MONO;
} }
error = FT_Load_Glyph(face, index, load_flags); error = FT_Load_Glyph(face, index, load_flags);
if (error) if (error) {
return geterror(error); return geterror(error);
}
error = FT_Get_Glyph(face->glyph, &glyph); error = FT_Get_Glyph(face->glyph, &glyph);
if (error) if (error) {
return geterror(error); return geterror(error);
}
FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_PIXELS, &bbox); FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_PIXELS, &bbox);
if (bbox.xMax > x_max) if (bbox.xMax > x_max) {
x_max = bbox.xMax; x_max = bbox.xMax;
if (bbox.xMin < x_min) }
if (bbox.xMin < x_min) {
x_min = bbox.xMin; x_min = bbox.xMin;
if (bbox.yMax > y_max) }
if (bbox.yMax > y_max) {
y_max = bbox.yMax; y_max = bbox.yMax;
if (bbox.yMin < y_min) }
if (bbox.yMin < y_min) {
y_min = bbox.yMin; y_min = bbox.yMin;
}
FT_Done_Glyph(glyph); FT_Done_Glyph(glyph);
} }
@ -920,16 +925,20 @@ font_render(FontObject* self, PyObject* args)
// compute baseline and adjust start position if glyph bearing extends before origin // compute baseline and adjust start position if glyph bearing extends before origin
if (horizontal_dir) { if (horizontal_dir) {
if (glyph_slot->bitmap_top > baseline) if (glyph_slot->bitmap_top > baseline) {
baseline = glyph_slot->bitmap_top; baseline = glyph_slot->bitmap_top;
if (glyph_slot->bitmap_left < offset) }
if (glyph_slot->bitmap_left < offset) {
offset = glyph_slot->bitmap_left; offset = glyph_slot->bitmap_left;
}
x += glyph_info[i].x_advance; x += glyph_info[i].x_advance;
} else { } else {
if (glyph_slot->bitmap_top > offset) if (glyph_slot->bitmap_top > offset) {
offset = glyph_slot->bitmap_top; offset = glyph_slot->bitmap_top;
if (glyph_slot->bitmap_left < baseline) }
if (glyph_slot->bitmap_left < baseline) {
baseline = glyph_slot->bitmap_left; baseline = glyph_slot->bitmap_left;
}
y += glyph_info[i].y_advance; y += glyph_info[i].y_advance;
} }
} }