python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-14 05:36:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12 from tk0miya/master

Browse Source 
Fix descender of some characters are chipped
This commit is contained in:
Alex Clark 2012-01-20 10:59:05 -08:00
commit 86b55a25f5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_imagingft.c
View File

@ -299,7 +299,7 @@ font_render(FontObject* self, PyObject* args)
{ {
int i, x, y; int i, x, y;
Imaging im; Imaging im;
int index, error, ascender; int index, error, ascender, descender;
int load_flags; int load_flags;
unsigned char *source; unsigned char *source;
FT_ULong ch; FT_ULong ch;
@ -349,6 +349,7 @@ font_render(FontObject* self, PyObject* args)
int xx, x0, x1; int xx, x0, x1;
source = (unsigned char*) glyph->bitmap.buffer; source = (unsigned char*) glyph->bitmap.buffer;
ascender = PIXEL(self->face->size->metrics.ascender); ascender = PIXEL(self->face->size->metrics.ascender);
descender = PIXEL(self->face->size->metrics.descender);
xx = x + glyph->bitmap_left; xx = x + glyph->bitmap_left;
x0 = 0; x0 = 0;
x1 = glyph->bitmap.width; x1 = glyph->bitmap.width;
@ -357,7 +358,7 @@ font_render(FontObject* self, PyObject* args)
if (xx + x1 > im->xsize) if (xx + x1 > im->xsize)
x1 = im->xsize - xx; x1 = im->xsize - xx;
for (y = 0; y < glyph->bitmap.rows; y++) { for (y = 0; y < glyph->bitmap.rows; y++) {
int yy = y + ascender - glyph->bitmap_top; int yy = y + ascender + descender - glyph->bitmap_top;
if (yy >= 0 && yy < im->ysize) { if (yy >= 0 && yy < im->ysize) {
/* blend this glyph into the buffer */ /* blend this glyph into the buffer */
unsigned char *target = im->image8[yy] + xx; unsigned char *target = im->image8[yy] + xx;
@ -378,6 +379,7 @@ font_render(FontObject* self, PyObject* args)
int xx, x0, x1; int xx, x0, x1;
source = (unsigned char*) glyph->bitmap.buffer; source = (unsigned char*) glyph->bitmap.buffer;
ascender = PIXEL(self->face->size->metrics.ascender); ascender = PIXEL(self->face->size->metrics.ascender);
descender = PIXEL(self->face->size->metrics.descender);
xx = x + glyph->bitmap_left; xx = x + glyph->bitmap_left;
x0 = 0; x0 = 0;
x1 = glyph->bitmap.width; x1 = glyph->bitmap.width;
@ -386,7 +388,7 @@ font_render(FontObject* self, PyObject* args)
if (xx + x1 > im->xsize) if (xx + x1 > im->xsize)
x1 = im->xsize - xx; x1 = im->xsize - xx;
for (y = 0; y < glyph->bitmap.rows; y++) { for (y = 0; y < glyph->bitmap.rows; y++) {
int yy = y + ascender - glyph->bitmap_top; int yy = y + ascender + descender - glyph->bitmap_top;
if (yy >= 0 && yy < im->ysize) { if (yy >= 0 && yy < im->ysize) {
/* blend this glyph into the buffer */ /* blend this glyph into the buffer */
int i; int i;