Skip to content

Fix rendered characters have been chipped for some TrueType fonts #185

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

Merged
aclark4life merged 2 commits into from
Apr 11, 2013
Merged

Fix rendered characters have been chipped for some TrueType fonts #185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e44f35e
Revert pull request #45
tk0miya Apr 11, 2013
efd70fb
Fix rendered characters have been chipped for some TrueType fonts
tk0miya Apr 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 32 additions & 10 deletions _imagingft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#include <freetype/freetype.h>
#endif

#include FT_GLYPH_H

#define KEEP_PY_UNICODE
#include "py3.h"

Expand Down Expand Up @@ -141,7 +143,7 @@ getfont(PyObject* self_, PyObject* args, PyObject* kw)

return (PyObject*) self;
}

static int
font_getchar(PyObject* string, int index, FT_ULong* char_out)
{
Expand Down Expand Up @@ -171,7 +173,7 @@ font_getchar(PyObject* string, int index, FT_ULong* char_out)
static PyObject*
font_getsize(FontObject* self, PyObject* args)
{
int i, x;
int i, x, y_max, y_min;
FT_ULong ch;
FT_Face face;
int xoffset;
Expand All @@ -195,6 +197,7 @@ font_getsize(FontObject* self, PyObject* args)

face = NULL;
xoffset = 0;
y_max = y_min = 0;

for (x = i = 0; font_getchar(string, i, &ch); i++) {
int index, error;
Expand All @@ -212,6 +215,16 @@ font_getsize(FontObject* self, PyObject* args)
if (i == 0)
xoffset = face->glyph->metrics.horiBearingX;
x += face->glyph->metrics.horiAdvance;

FT_BBox bbox;
FT_Glyph glyph;
FT_Get_Glyph(face->glyph, &glyph);
FT_Glyph_Get_CBox(glyph, FT_GLYPH_BBOX_SUBPIXELS, &bbox);
if (bbox.yMax > y_max)
y_max = bbox.yMax;
if (bbox.yMin < y_min)
y_min = bbox.yMin;

last_index = index;
}

Expand All @@ -232,7 +245,7 @@ font_getsize(FontObject* self, PyObject* args)

return Py_BuildValue(
"(ii)(ii)",
PIXEL(x), PIXEL(self->face->size->metrics.height),
PIXEL(x), PIXEL(y_max - y_min),
PIXEL(xoffset), 0
);
}
Expand Down Expand Up @@ -282,7 +295,7 @@ font_render(FontObject* self, PyObject* args)
{
int i, x, y;
Imaging im;
int index, error, ascender, descender;
int index, error, ascender;
int load_flags;
unsigned char *source;
FT_ULong ch;
Expand Down Expand Up @@ -313,6 +326,19 @@ font_render(FontObject* self, PyObject* args)
if (mask)
load_flags |= FT_LOAD_TARGET_MONO;

int temp;
ascender = 0;
for (i = 0; font_getchar(string, i, &ch); i++) {
index = FT_Get_Char_Index(self->face, ch);
error = FT_Load_Glyph(self->face, index, load_flags);
if (error)
return geterror(error);
glyph = self->face->glyph;
temp = (glyph->bitmap.rows - glyph->bitmap_top);
if (temp > ascender)
ascender = temp;
}

for (x = i = 0; font_getchar(string, i, &ch); i++) {
if (i == 0 && self->face->glyph->metrics.horiBearingX < 0)
x = -PIXEL(self->face->glyph->metrics.horiBearingX);
Expand All @@ -331,8 +357,6 @@ font_render(FontObject* self, PyObject* args)
/* use monochrome mask (on palette images, etc) */
int xx, x0, x1;
source = (unsigned char*) glyph->bitmap.buffer;
ascender = PIXEL(self->face->size->metrics.ascender);
descender = PIXEL(self->face->size->metrics.descender);
xx = x + glyph->bitmap_left;
x0 = 0;
x1 = glyph->bitmap.width;
Expand All @@ -341,7 +365,7 @@ font_render(FontObject* self, PyObject* args)
if (xx + x1 > im->xsize)
x1 = im->xsize - xx;
for (y = 0; y < glyph->bitmap.rows; y++) {
int yy = y + ascender + descender - glyph->bitmap_top;
int yy = y + im->ysize - (PIXEL(glyph->metrics.horiBearingY) + ascender);
if (yy >= 0 && yy < im->ysize) {
/* blend this glyph into the buffer */
unsigned char *target = im->image8[yy] + xx;
Expand All @@ -361,8 +385,6 @@ font_render(FontObject* self, PyObject* args)
/* use antialiased rendering */
int xx, x0, x1;
source = (unsigned char*) glyph->bitmap.buffer;
ascender = PIXEL(self->face->size->metrics.ascender);
descender = PIXEL(self->face->size->metrics.descender);
xx = x + glyph->bitmap_left;
x0 = 0;
x1 = glyph->bitmap.width;
Expand All @@ -371,7 +393,7 @@ font_render(FontObject* self, PyObject* args)
if (xx + x1 > im->xsize)
x1 = im->xsize - xx;
for (y = 0; y < glyph->bitmap.rows; y++) {
int yy = y + ascender + descender - glyph->bitmap_top;
int yy = y + im->ysize - (PIXEL(glyph->metrics.horiBearingY) + ascender);
if (yy >= 0 && yy < im->ysize) {
/* blend this glyph into the buffer */
int i;
Expand Down