Commit 36afdb3a authored by David Turner's avatar David Turner
Browse files

fixed a bug in the Type 1 and CID font drivers:

  the value of the descent returned was positive,
  instead of being negative..
parent 0339b684
...@@ -16,6 +16,22 @@ ...@@ -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 #ifndef FTSYNTH_H
#define FTSYNTH_H #define FTSYNTH_H
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
root->bbox = face->cid.font_bbox; root->bbox = face->cid.font_bbox;
root->units_per_EM = 1000; root->units_per_EM = 1000;
root->ascender = (FT_Short)face->cid.font_bbox.yMax; 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 ) root->height = ( ( root->ascender + root->descender ) * 12 )
/ 10; / 10;
......
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
root->bbox = face->type1.font_bbox; root->bbox = face->type1.font_bbox;
root->units_per_EM = 1000; root->units_per_EM = 1000;
root->ascender = (FT_Short)face->type1.font_bbox.yMax; 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; root->height = ( ( root->ascender + root->descender ) * 12 ) / 10;
/* now compute the maximum advance width */ /* now compute the maximum advance width */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment