From: Mark A. Hershberger Date: Thu, 6 Jun 2019 13:07:36 +0000 (-0400) Subject: Restore height and with from that were accidentally removed X-Git-Tag: emacs-27.0.90~2685 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8123b45f7b9b660db2040ee85c3a2fd260d3f16;p=emacs.git Restore height and with from that were accidentally removed See 610fb73ab6d7a22b722f523d6ebc4aa8fa1db7c9 USE_CARIO needs these. --- diff --git a/src/image.c b/src/image.c index a95a7bf27f9..29cb2fc10b9 100644 --- a/src/image.c +++ b/src/image.c @@ -2035,6 +2035,8 @@ image_set_rotation (struct image *img, double tm[3][3]) static void image_set_crop (struct image *img, double tm[3][3]) { + int width, height; + compute_image_size (img->width, img->height, img->spec, &width, &height); #ifdef HAVE_NATIVE_TRANSFORMS # ifdef HAVE_IMAGEMAGICK /* ImageMagick images are already cropped. */ @@ -2051,7 +2053,7 @@ image_set_crop (struct image *img, double tm[3][3]) # endif double m[3][3], tmp[3][3]; - int left, top, width, height; + int left, top; Lisp_Object x = Qnil; Lisp_Object y = Qnil; Lisp_Object w = Qnil;