# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1082499393 0
# Node ID dda0bae93c73acb0608223c58bdb1567b63bcd32
# Parent  78fbab658433c58cd43268e4af95721ce9cb9fa6
(image_ascent): Add slice arg; calculate ascent for
image slice (or full image).

diff -r 78fbab658433 -r dda0bae93c73 src/image.c
--- a/src/image.c	Tue Apr 20 22:16:19 2004 +0000
+++ b/src/image.c	Tue Apr 20 22:16:33 2004 +0000
@@ -1076,13 +1076,21 @@
    drawn in face FACE.  */
 
 int
-image_ascent (img, face)
+image_ascent (img, face, slice)
      struct image *img;
      struct face *face;
-{
-  int height = img->height + img->vmargin;
+     struct glyph_slice *slice;
+{
+  int height;
   int ascent;
 
+  if (slice->height == img->height)
+    height = img->height + img->vmargin;
+  else if (slice->y == 0)
+    height = slice->height + img->vmargin;
+  else
+    height = slice->height;
+
   if (img->ascent == CENTERED_IMAGE_ASCENT)
     {
       if (face->font)