Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix unused macro build warning in image.c

Browse source 
* 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.
This commit is contained in:
Basil L. Contovounesios 2021-02-13 14:51:48 +00:00
parent 175ebb0104
commit c4cc80e1fb
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/image.c
View 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