stop ft1.x support dropping descenders

diff --git a/Changes b/Changes
index a2d926f44487c58cf432dbec75aa4da5bbe4d8fd..28664fa569b42c1c3cb9bb0771c463d845f583ac 100644 (file)
--- a/Changes
+++ b/Changes
@@ -517,6 +517,9 @@ Revision history for Perl extension Imager.
         - unsharp mask
         - make i_conv() clamp the bottom end of the samples range too
           (makes it useful for sharpening)
+        - adjust ascender/descender values for FT1.x to avoid losing
+          descenders (specifically the bottom of "g" in ImUgly.ttf or
+          arial.ttf at 14pixels)
 
 =================================================================
 

diff --git a/MANIFEST b/MANIFEST
index 33baea2f1a4263783a5a5bf7dfcca44c85923e0f..f4d7804d2ed4a5f97d489745113c9014a236a9fd 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -49,6 +49,7 @@ tags.c
 trans2.c
 iolayer.h
 iolayer.c
+fontfiles/ImUgly.ttf
 fontfiles/dcr10.afm
 fontfiles/dcr10.pfb
 fontfiles/dodge.ttf

diff --git a/font.c b/font.c
index 395d7da0f2e13c3685b3b5571cf84aec40087825..293b5bead1659e7e7238d4f94ab7e7b50f0dfbef 100644 (file)
--- a/font.c
+++ b/font.c
@@ -1134,8 +1134,8 @@ i_tt_bbox_inst( TT_Fonthandle *handle, int inst ,const char *txt, int len, int c
   mm_log((1,"i_tt_box_inst(handle 0x%X,inst %d,txt '%.*s', len %d)\n",handle,inst,len,txt,len));
 
   upm     = handle->properties.header->Units_Per_EM;
-  gascent  = ( handle->properties.horizontal->Ascender  * handle->instanceh[inst].imetrics.y_ppem ) / upm;
-  gdescent = ( handle->properties.horizontal->Descender * handle->instanceh[inst].imetrics.y_ppem ) / upm;
+  gascent  = ( handle->properties.horizontal->Ascender  * handle->instanceh[inst].imetrics.y_ppem + upm - 1) / upm;
+  gdescent = ( handle->properties.horizontal->Descender * handle->instanceh[inst].imetrics.y_ppem - upm + 1) / upm;
   
   width   = 0;
   start   = 0;
@@ -1148,15 +1148,15 @@ i_tt_bbox_inst( TT_Fonthandle *handle, int inst ,const char *txt, int len, int c
     if ( i_tt_get_glyph(handle,inst,j) ) {
       TT_Glyph_Metrics *gm = handle->instanceh[inst].gmetrics + j;
       width += gm->advance   / 64;
-      casc   = gm->bbox.yMax / 64;
-      cdesc  = gm->bbox.yMin / 64;
+      casc   = (gm->bbox.yMax+63) / 64;
+      cdesc  = (gm->bbox.yMin-63) / 64;
 
       mm_log((1, "i_tt_box_inst: glyph='%c' casc=%d cdesc=%d\n", j, casc, cdesc));
 
       if (first) {
        start    = gm->bbox.xMin / 64;
-       ascent   = gm->bbox.yMax / 64;
-       descent  = gm->bbox.yMin / 64;
+       ascent   = (gm->bbox.yMax+63) / 64;
+       descent  = (gm->bbox.yMin-63) / 64;
        first = 0;
       }
       if (i == len-1) {

diff --git a/fontfiles/ImUgly.ttf b/fontfiles/ImUgly.ttf
new file mode 100644 (file)
index 0000000..eb07393
Binary files /dev/null and b/fontfiles/ImUgly.ttf differ

diff --git a/t/t35ttfont.t b/t/t35ttfont.t
index a82bba589e473454f8d2f2486a399c4aae4de6af..0caeacd46e679c21a524e7e7c9fe9df4c6b91c9a 100644 (file)
--- a/t/t35ttfont.t
+++ b/t/t35ttfont.t
@@ -63,6 +63,11 @@ $backgr=Imager::ImgRaw::new(500,300,3);
 
 i_tt_text($ttraw,$backgr,100,100,$bgcolor,50.0,'test',4,1);
 
+my $ugly = Imager::i_tt_new("./fontfiles/ImUgly.ttf");
+i_tt_text($ugly, $backgr,100, 50, $bgcolor, 14, 'g', 1, 1);
+i_tt_text($ugly, $backgr,150, 50, $bgcolor, 14, 'delta', 5, 1);
+
+
 open(FH,">testout/t35ttfont2.ppm") || die "cannot open testout/t35ttfont.ppm\n";
 binmode(FH);
 $IO = Imager::io_new_fd( fileno(FH) );