comparison src/w32font.c @ 93675:7fb9a5b86fa8

(w32font_text_extents): Use font's ascent and descent. (recompute_cached_metrics): Don't set ascent and descent per char.

93674:44fab469d68d

      /* Set transform to the identity matrix.  */
      bzero (&transform, sizeof (transform));
      transform.eM11.value = 1;
      transform.eM22.value = 1;
      metrics->width = 0;
      metrics->ascent = 0;
      metrics->descent = 0;
      metrics->lbearing = 0;

      for (i = 0; i < nglyphs; i++)
        {
          if (*(code + i) < 128)

              metrics->lbearing = min (metrics->lbearing,
                                       metrics->width + char_metric->lbearing);
              metrics->rbearing = max (metrics->rbearing,
                                       metrics->width + char_metric->rbearing);
              metrics->width += char_metric->width;
              metrics->ascent = max (metrics->ascent, char_metric->ascent);
              metrics->descent = max (metrics->descent, char_metric->descent);
            }
          else
            {
              if (dc == NULL)
                {

                    + gm.gmptGlyphOrigin.x;
                  metrics->rbearing = max (metrics->rbearing, new_val);
                  new_val = metrics->width + gm.gmptGlyphOrigin.x;
                  metrics->lbearing = min (metrics->lbearing, new_val);
                  metrics->width += gm.gmCellIncX;
                  new_val = gm.gmBlackBoxY;
                  metrics->ascent = max (metrics->ascent, new_val);
                  new_val = (gm.gmCellIncY - gm.gmptGlyphOrigin.y
			     - gm.gmBlackBoxY);
                  metrics->descent = max (metrics->descent, new_val);
                }
              else
                {
                  if (w32_font->glyph_idx)
                    {

  /* Give our best estimate of the metrics, based on what we know.  */
  if (metrics)
    {
      metrics->width = total_width;
      metrics->ascent = font->ascent;
      metrics->descent = font->descent;
      metrics->lbearing = 0;
      metrics->rbearing = total_width
        + ((struct w32font_info *) font)->metrics.tmOverhang;
    }

          != GDI_ERROR)
        {
          char_metric->lbearing = gm.gmptGlyphOrigin.x;
          char_metric->rbearing = gm.gmBlackBoxX + gm.gmptGlyphOrigin.x;
          char_metric->width = gm.gmCellIncX;
          char_metric->ascent = gm.gmBlackBoxY;
          char_metric->descent = (gm.gmCellIncY - gm.gmptGlyphOrigin.y
				  - gm.gmBlackBoxY);
        }
      else
        char_metric->width = 0;
    }
}

93675:7fb9a5b86fa8

      /* Set transform to the identity matrix.  */
      bzero (&transform, sizeof (transform));
      transform.eM11.value = 1;
      transform.eM22.value = 1;
      metrics->width = 0;
      metrics->ascent = font->ascent;
      metrics->descent = font->descent;
      metrics->lbearing = 0;

      for (i = 0; i < nglyphs; i++)
        {
          if (*(code + i) < 128)

              metrics->lbearing = min (metrics->lbearing,
                                       metrics->width + char_metric->lbearing);
              metrics->rbearing = max (metrics->rbearing,
                                       metrics->width + char_metric->rbearing);
              metrics->width += char_metric->width;
            }
          else
            {
              if (dc == NULL)
                {

                    + gm.gmptGlyphOrigin.x;
                  metrics->rbearing = max (metrics->rbearing, new_val);
                  new_val = metrics->width + gm.gmptGlyphOrigin.x;
                  metrics->lbearing = min (metrics->lbearing, new_val);
                  metrics->width += gm.gmCellIncX;
                }
              else
                {
                  if (w32_font->glyph_idx)
                    {

  /* Give our best estimate of the metrics, based on what we know.  */
  if (metrics)
    {
      metrics->width = total_width;
      metrics->lbearing = 0;
      metrics->rbearing = total_width
        + ((struct w32font_info *) font)->metrics.tmOverhang;
    }

          != GDI_ERROR)
        {
          char_metric->lbearing = gm.gmptGlyphOrigin.x;
          char_metric->rbearing = gm.gmBlackBoxX + gm.gmptGlyphOrigin.x;
          char_metric->width = gm.gmCellIncX;
        }
      else
        char_metric->width = 0;
    }
}