From: Yuuki Harano <masm+github@masm11.me>
Date: Sun, 18 Apr 2021 06:30:29 +0000 (+0900)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
X-Git-Tag: emacs-29.0.90~3713
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de46c7796e635faf8647a7c6a5ae34fda9adae3b;p=emacs.git

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

de46c7796e635faf8647a7c6a5ae34fda9adae3b
diff --cc .gitignore
index 72813833237,c262f39126d..7be876b9444
--- a/.gitignore
+++ b/.gitignore
@@@ -302,5 -304,8 +304,11 @@@ nt/emacsclient.r
  src/gdb.ini
  /var/
  
+ # Seccomp filter files.
+ lib-src/seccomp-filter.bpf
+ lib-src/seccomp-filter.pfc
+ lib-src/seccomp-filter-exec.bpf
+ lib-src/seccomp-filter-exec.pfc
++
 +# gsettings schema
 +/etc/*.gschema.valid
diff --cc configure.ac
index 17e5fcf211c,d3647bdc2a2..fc95d19ee28
--- a/configure.ac
+++ b/configure.ac
@@@ -5751,7 -5694,8 +5773,8 @@@ optsep
  emacs_config_features=
  for opt in ACL CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \
   HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
-  M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SOUND THREADS TIFF \
 - M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PNG RSVG SECCOMP SOUND \
++ M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SECCOMP SOUND \
+  THREADS TIFF \
   TOOLKIT_SCROLL_BARS UNEXEC X11 XAW3D XDBE XFT XIM XPM XWIDGETS X_TOOLKIT \
   ZLIB; do
  
diff --cc src/image.c
index 107670d72c1,ff4ef018044..96084068dcd
--- a/src/image.c
+++ b/src/image.c
@@@ -9342,13 -9230,9 +9364,13 @@@ imagemagick_load_image (struct frame *f
      PixelSetBlue  (bg_wand, (double) bgcolor.blue  / 65535);
    }
  
 +#ifndef DONT_CREATE_TRANSFORMED_IMAGEMAGICK_IMAGE
    compute_image_size (MagickGetImageWidth (image_wand),
  		      MagickGetImageHeight (image_wand),
- 		      img->spec, &desired_width, &desired_height);
+ 		      img, &desired_width, &desired_height);
 +#else
 +  desired_width = desired_height = -1;
 +#endif
  
    if (desired_width != -1 && desired_height != -1)
      {