[Emacs-diffs] Changes to emacs/src/image.c

[Kim F . Storm]

Index: emacs/src/image.c
diff -c emacs/src/image.c:1.33 emacs/src/image.c:1.34
*** emacs/src/image.c:1.33      Wed Aug 31 08:35:28 2005
--- emacs/src/image.c   Wed Sep 28 10:48:20 2005
***************
*** 7369,7376 ****
        return 0;
      }
  
!   width = img->width = max (gif->SWidth, gif->Image.Left + gif->Image.Width);
!   height = img->height = max (gif->SHeight, gif->Image.Top + 
gif->Image.Height);
  
    /* Create the X image and pixmap.  */
    if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
--- 7369,7385 ----
        return 0;
      }
  
!   image_top = gif->SavedImages[ino].ImageDesc.Top;
!   image_left = gif->SavedImages[ino].ImageDesc.Left;
!   image_width = gif->SavedImages[ino].ImageDesc.Width;
!   image_height = gif->SavedImages[ino].ImageDesc.Height;
! 
!   width = img->width = max (gif->SWidth,
!                           max (gif->Image.Left + gif->Image.Width,
!                                image_left + image_width));
!   height = img->height = max (gif->SHeight,
!                             max (gif->Image.Top + gif->Image.Height,
!                                  image_top + image_height));
  
    /* Create the X image and pixmap.  */
    if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
***************
*** 7405,7415 ****
       requires more than can be done here (see the gif89 spec,
       disposal methods).  Let's simply assume that the part
       not covered by a sub-image is in the frame's background color.  */
-   image_top = gif->SavedImages[ino].ImageDesc.Top;
-   image_left = gif->SavedImages[ino].ImageDesc.Left;
-   image_width = gif->SavedImages[ino].ImageDesc.Width;
-   image_height = gif->SavedImages[ino].ImageDesc.Height;
- 
    for (y = 0; y < image_top; ++y)
      for (x = 0; x < width; ++x)
        XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
--- 7414,7419 ----