From 36afdb3a8b9f53a5bb5357a1d0d5dee7ecfe82a9 Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 27 Sep 2000 01:01:10 +0000 Subject: [PATCH] fixed a bug in the Type 1 and CID font drivers: the value of the descent returned was positive, instead of being negative.. --- include/freetype/ftsynth.h | 16 ++++++++++++++++ src/cid/cidobjs.c | 2 +- src/type1z/z1objs.c | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h index 72d7c4f41..cfe02062f 100644 --- a/include/freetype/ftsynth.h +++ b/include/freetype/ftsynth.h @@ -16,6 +16,22 @@ /* */ /***************************************************************************/ + /**************************************************************************/ + /**************************************************************************/ + /**************************************************************************/ + /**************************************************************************/ + /**************************************************************************/ + /********* **********/ + /********* **********/ + /********* WARNING, THIS IS ALPHA CODE, THIS API **********/ + /********* IS DUE TO CHANGE UNTIL STRICTLY NOTIFIED BY THE **********/ + /********* FREETYPE DEVELOPMENT TEAM **********/ + /********* **********/ + /**************************************************************************/ + /**************************************************************************/ + /**************************************************************************/ + /**************************************************************************/ + /**************************************************************************/ #ifndef FTSYNTH_H #define FTSYNTH_H diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index 334d14b79..8f264fc76 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -236,7 +236,7 @@ root->bbox = face->cid.font_bbox; root->units_per_EM = 1000; root->ascender = (FT_Short)face->cid.font_bbox.yMax; - root->descender = -(FT_Short)face->cid.font_bbox.yMin; + root->descender = (FT_Short)face->cid.font_bbox.yMin; root->height = ( ( root->ascender + root->descender ) * 12 ) / 10; diff --git a/src/type1z/z1objs.c b/src/type1z/z1objs.c index 4a6ea3d4a..b29e76701 100644 --- a/src/type1z/z1objs.c +++ b/src/type1z/z1objs.c @@ -265,7 +265,7 @@ root->bbox = face->type1.font_bbox; root->units_per_EM = 1000; root->ascender = (FT_Short)face->type1.font_bbox.yMax; - root->descender = -(FT_Short)face->type1.font_bbox.yMin; + root->descender = (FT_Short)face->type1.font_bbox.yMin; root->height = ( ( root->ascender + root->descender ) * 12 ) / 10; /* now compute the maximum advance width */