Skip to content

Commit 558254f

Browse files
committed
Revert "Fix descender parameter was ignored on rendering truetype fonts"
This reverts commit 501c5c4.
1 parent 9488cb1 commit 558254f

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

_imagingft.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ font_render(FontObject* self, PyObject* args)
299299
{
300300
int i, x, y;
301301
Imaging im;
302-
int index, error, ascender, descender;
302+
int index, error, ascender;
303303
int load_flags;
304304
unsigned char *source;
305305
FT_ULong ch;
@@ -349,7 +349,6 @@ font_render(FontObject* self, PyObject* args)
349349
int xx, x0, x1;
350350
source = (unsigned char*) glyph->bitmap.buffer;
351351
ascender = PIXEL(self->face->size->metrics.ascender);
352-
descender = PIXEL(self->face->size->metrics.descender);
353352
xx = x + glyph->bitmap_left;
354353
x0 = 0;
355354
x1 = glyph->bitmap.width;
@@ -358,7 +357,7 @@ font_render(FontObject* self, PyObject* args)
358357
if (xx + x1 > im->xsize)
359358
x1 = im->xsize - xx;
360359
for (y = 0; y < glyph->bitmap.rows; y++) {
361-
int yy = y + ascender + descender - glyph->bitmap_top;
360+
int yy = y + ascender - glyph->bitmap_top;
362361
if (yy >= 0 && yy < im->ysize) {
363362
/* blend this glyph into the buffer */
364363
unsigned char *target = im->image8[yy] + xx;
@@ -379,7 +378,6 @@ font_render(FontObject* self, PyObject* args)
379378
int xx, x0, x1;
380379
source = (unsigned char*) glyph->bitmap.buffer;
381380
ascender = PIXEL(self->face->size->metrics.ascender);
382-
descender = PIXEL(self->face->size->metrics.descender);
383381
xx = x + glyph->bitmap_left;
384382
x0 = 0;
385383
x1 = glyph->bitmap.width;
@@ -388,7 +386,7 @@ font_render(FontObject* self, PyObject* args)
388386
if (xx + x1 > im->xsize)
389387
x1 = im->xsize - xx;
390388
for (y = 0; y < glyph->bitmap.rows; y++) {
391-
int yy = y + ascender + descender - glyph->bitmap_top;
389+
int yy = y + ascender - glyph->bitmap_top;
392390
if (yy >= 0 && yy < im->ysize) {
393391
/* blend this glyph into the buffer */
394392
int i;

0 commit comments

Comments
 (0)