]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix unused macro build warning in image.c
authorBasil L. Contovounesios <contovob@tcd.ie>
Sat, 13 Feb 2021 14:51:48 +0000 (14:51 +0000)
committerBasil L. Contovounesios <contovob@tcd.ie>
Sun, 14 Feb 2021 12:29:25 +0000 (12:29 +0000)
* src/image.c
[HAVE_PGTK] (DONT_CREATE_TRANSFORMED_IMAGEMAGICK_IMAGE): Define only
if HAVE_IMAGEMAGICK is also defined, as it is otherwise
unused (bug#46491).
(image_set_transform): Reduce nesting of preprocessor conditionals.

src/image.c

index cc97ca4d7cc334ace6e539509f62b277144f376f..09370fa833d4629f8bdc061633fee4fcf5b68e1e 100644 (file)
@@ -99,7 +99,7 @@ static unsigned long image_alloc_image_color (struct frame *, struct image *,
                                              Lisp_Object, unsigned long);
 #endif /* USE_CAIRO */
 
-#ifdef HAVE_PGTK
+#if defined HAVE_PGTK && defined HAVE_IMAGEMAGICK
 /* On pgtk, we don't want to create scaled image.
  * If we create scaled image on scale=2.0 environment,
  * the created image is half size and Gdk scales it back,
@@ -2307,12 +2307,11 @@ compute_image_rotation (struct image *img, double *rotation)
 static void
 image_set_transform (struct frame *f, struct image *img)
 {
-# ifdef HAVE_IMAGEMAGICK
-#  ifndef DONT_CREATE_TRANSFORMED_IMAGEMAGICK_IMAGE
+# if (defined HAVE_IMAGEMAGICK \
+      && !defined DONT_CREATE_TRANSFORMED_IMAGEMAGICK_IMAGE)
   /* ImageMagick images already have the correct transform.  */
   if (EQ (image_spec_value (img->spec, QCtype, NULL), Qimagemagick))
     return;
-#  endif
 # endif
 
 # if !defined USE_CAIRO && defined HAVE_XRENDER