From c4cc80e1fbbfb50486c6ce360f2d68e96fc45887 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Sat, 13 Feb 2021 14:51:48 +0000 Subject: [PATCH] Fix unused macro build warning in image.c * 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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/image.c b/src/image.c index cc97ca4d7cc..09370fa833d 100644 --- a/src/image.c +++ b/src/image.c @@ -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 -- 2.39.5