Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index 126f2cb11e5..df04db45955 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3051,6 +3051,10 @@ struct image
 # if !defined USE_CAIRO && defined HAVE_XRENDER
   /* Picture versions of pixmap and mask for compositing.  */
   Picture picture, mask_picture;
+
+  /* We need to store the original image dimensions in case we have to
+     call XGetImage.  */
+  int original_width, original_height;
 # endif
 #endif  /* HAVE_X_WINDOWS */
 #ifdef HAVE_NTGUI