Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed bugs in calculating text size #3864

Merged
merged 2 commits into from Jun 19, 2019
Merged

Fixed bugs in calculating text size #3864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb38296
Change direction of y offset in calculating size
radarhere May 23, 2019
ea0f1c6
Do not presume that the last glyph has the max x value
radarhere Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added Tests/fonts/ArefRuqaa-Regular.ttf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Tests/fonts/LICENSE.txt
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ NotoNastaliqUrdu-Regular.ttf, from https://github.com/googlei18n/noto-fonts
NotoSansJP-Thin.otf, from https://www.google.com/get/noto/help/cjk/
AdobeVFPrototype.ttf, from https://github.com/adobe-fonts/adobe-variable-font-prototype
TINY5x3GX.ttf, from http://velvetyne.fr/fonts/tiny
ArefRuqaa-Regular.ttf, from https://github.com/google/fonts/tree/master/ofl/arefruqaa

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.

Expand Down
Binary file added Tests/images/test_x_max_and_y_offset.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/images/test_y_offset.png
View file
Open in desktop
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
View file
Open in desktop
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
41 changes: 20 additions & 21 deletions src/_imagingft.c
View file
Open in desktop
Expand Up @@ -618,7 +618,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 @@ -634,18 +634,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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason for moving these declarations before use?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

x_advanced is new, not moved. I'm happy to move the declarations down if you like, I'm just going with the convention established in the code - I moved the offset declaration up because it is no longer inside a conditional block.

FT_BBox bbox;
FT_Glyph glyph;
face = self->face;
Expand All @@ -661,7 +661,7 @@ font_getsize(FontObject* self, PyObject* args)
if (horizontal_dir) {
if (face->glyph->metrics.horiBearingX < 0) {
xoffset = face->glyph->metrics.horiBearingX;
x_max -= xoffset;
x_position -= xoffset;
}
} else {
if (face->glyph->metrics.vertBearingY < 0) {
Expand All @@ -674,20 +674,19 @@ 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;
}

bbox.yMax -= glyph_info[i].y_offset;
bbox.yMin -= glyph_info[i].y_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;
if (bbox.yMax > y_max)
y_max = bbox.yMax;
if (bbox.yMin < y_min)
Expand Down