From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 11 Dec 2020 15:02:50 +0000 (+0100)
Subject: Fix compilation of image.c on non-Cairo systems
X-Git-Tag: emacs-28.0.90~4785
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eebb7c8a699614934e0b054536d9c6f102b59e34;p=emacs.git

Fix compilation of image.c on non-Cairo systems

* src/image.c (image_frame_cache_size): pixmap->width etc is only
defined on Cairo.  Return 0 for now on other systems.
---

diff --git a/src/image.c b/src/image.c
index 38887ced25b..8607b33a7a8 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1805,9 +1805,11 @@ image_frame_cache_size (struct frame *f)
     {
       struct image *img = c->images[i];
 
+#ifdef USE_CAIRO
       if (img)
 	total += img->pixmap->width * img->pixmap->height  *
 	  img->pixmap->bits_per_pixel / 8;
+#endif
     }
   return total;
 }