Skip to content

Commit

Permalink
Do not presume that the last glyph has the max x value
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Jun 19, 2019
1 parent d0c5677 commit e143727
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 18 deletions.
Binary file added Tests/fonts/ArefRuqaa-Regular.ttf
Binary file not shown.
3 changes: 2 additions & 1 deletion Tests/fonts/LICENSE.txt
@@ -1,8 +1,9 @@

NotoNastaliqUrdu-Regular.ttf, from https://github.com/googlei18n/noto-fonts
NotoSansJP-Thin.otf, from https://www.google.com/get/noto/help/cjk/
ArefRuqaa-Regular.ttf, from https://github.com/google/fonts/tree/master/ofl/arefruqaa

All Noto fonts are published under the SIL Open Font License (OFL) v1.1 (http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL), which allows you to copy, modify, and redistribute them if you need to.
All of the above fonts are published under the SIL Open Font License (OFL) v1.1 (http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL), which allows you to copy, modify, and redistribute them if you need to.


10x20-ISO8859-1.pcf
Expand Down
Binary file added Tests/images/test_x_max_and_y_offset.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Tests/test_imagefontctl.py
Expand Up @@ -159,6 +159,18 @@ def test_arabictext_features(self):

self.assert_image_similar(im, target_img, .5)

def test_x_max_and_y_offset(self):
ttf = ImageFont.truetype("Tests/fonts/ArefRuqaa-Regular.ttf", 40)

im = Image.new(mode='RGB', size=(50, 100))
draw = ImageDraw.Draw(im)
draw.text((0, 0), 'لح', font=ttf, fill=500)

target = 'Tests/images/test_x_max_and_y_offset.png'
target_img = Image.open(target)

self.assert_image_similar(im, target_img, .5)

def test_language(self):
ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)

Expand Down
33 changes: 16 additions & 17 deletions src/_imagingft.c
Expand Up @@ -616,7 +616,7 @@ text_layout(PyObject* string, FontObject* self, const char* dir, PyObject *featu
static PyObject*
font_getsize(FontObject* self, PyObject* args)
{
int x_max, x_min, y_max, y_min;
int x_position, x_max, x_min, y_max, y_min;
FT_Face face;
int xoffset, yoffset;
int horizontal_dir;
Expand All @@ -632,18 +632,18 @@ font_getsize(FontObject* self, PyObject* args)
if (!PyArg_ParseTuple(args, "O|zOz:getsize", &string, &dir, &features, &lang))
return NULL;

face = NULL;
xoffset = yoffset = 0;
x_max = x_min = y_max = y_min = 0;

count = text_layout(string, self, dir, features, lang, &glyph_info, 0);
if (PyErr_Occurred()) {
return NULL;
}

face = NULL;
xoffset = yoffset = 0;
x_position = x_max = x_min = y_max = y_min = 0;

horizontal_dir = dir && strcmp(dir, "ttb") == 0 ? 0 : 1;
for (i = 0; i < count; i++) {
int index, error;
int index, error, offset, x_advanced;
FT_BBox bbox;
FT_Glyph glyph;
face = self->face;
Expand Down Expand Up @@ -672,17 +672,16 @@ font_getsize(FontObject* self, PyObject* args)
FT_Get_Glyph(face->glyph, &glyph);
FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_SUBPIXELS, &bbox);
if (horizontal_dir) {
x_max += glyph_info[i].x_advance;

if (i == count - 1) {
// trim end gap from final glyph
int offset;
offset = glyph_info[i].x_advance -
face->glyph->metrics.width -
face->glyph->metrics.horiBearingX;
if (offset < 0)
x_max -= offset;
}
x_position += glyph_info[i].x_advance;

x_advanced = x_position;
offset = glyph_info[i].x_advance -
face->glyph->metrics.width -
face->glyph->metrics.horiBearingX;
if (offset < 0)
x_advanced -= offset;
if (x_advanced > x_max)
x_max = x_advanced;

bbox.yMax += glyph_info[i].y_offset;
bbox.yMin += glyph_info[i].y_offset;
Expand Down

0 comments on commit e143727

Please sign in to comment.