# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 957297749 0
# Node ID 796eafcfc0705363c35b130a008494cb177fc87f
# Parent  072a2799136be21f45fafe115d6d3c1d4b441e34
(x_produce_image_glyph, x_draw_image_foreground)
(x_draw_image_relief, x_draw_image_foreground_1): Call function
image_ascent instead of using IMAGE_ASCENT.

diff -r 072a2799136b -r 796eafcfc070 src/xterm.c
--- a/src/xterm.c	Tue May 02 20:01:46 2000 +0000
+++ b/src/xterm.c	Tue May 02 20:02:29 2000 +0000
@@ -1492,7 +1492,7 @@
   PREPARE_FACE_FOR_DISPLAY (it->f, face);
   prepare_image_for_display (it->f, img);
 
-  it->ascent = it->phys_ascent = IMAGE_ASCENT (img);
+  it->ascent = it->phys_ascent = image_ascent (img, face);
   it->descent = it->phys_descent = img->height + 2 * img->margin - it->ascent;
   it->pixel_width = img->width + 2 * img->margin;
 
@@ -3560,7 +3560,7 @@
      struct glyph_string *s;
 {
   int x;
-  int y = s->ybase - IMAGE_ASCENT (s->img);
+  int y = s->ybase - image_ascent (s->img, s->face);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
@@ -3639,7 +3639,7 @@
   int x0, y0, x1, y1, thick, raised_p;
   XRectangle r;
   int x;
-  int y = s->ybase - IMAGE_ASCENT (s->img);
+  int y = s->ybase - image_ascent (s->img, s->face);
   
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */
@@ -3688,7 +3688,7 @@
      Pixmap pixmap;
 {
   int x;
-  int y = s->ybase - s->y - IMAGE_ASCENT (s->img);
+  int y = s->ybase - s->y - image_ascent (s->img, s->face);
 
   /* If first glyph of S has a left box line, start drawing it to the
      right of that line.  */