From: "Basil L. Contovounesios" <contovob@tcd.ie>
To: 46491@debbugs.gnu.org
Cc: yuuki harano <masm+emacs@masm11.me>
Subject: bug#46491: [feature/pgtk] Unused macro warning in image.c without ImageMagick
Date: Sat, 13 Feb 2021 16:34:22 +0000 [thread overview]
Message-ID: <871rdksz8x.fsf@tcd.ie> (raw)
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
X-Debbugs-Cc: Yuuki Harano <masm+emacs@masm11.me>
Severity: minor
Tags: patch
The following is the only build warning I currently get on feature/pgtk:
image.c:110: warning: macro "DONT_CREATE_TRANSFORMED_IMAGEMAGICK_IMAGE"
is not used [-Wunused-macros]
110 | # define DONT_CREATE_TRANSFORMED_IMAGEMAGICK_IMAGE
Is the attached patch the right fix? If so, I can push it after adding
the bug#number to it.
Thanks,
--
Basil
In GNU Emacs 28.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.24, cairo version 1.16.0)
of 2021-02-13 built on tia
Repository revision: 175ebb010477ff0e174fe5145154397f43dee2d2
Repository branch: feature/pgtk
Windowing system distributor 'System Description: Debian GNU/Linux bullseye/sid
Configured using:
'configure 'CC=ccache gcc' 'CFLAGS=-O2 -march=native' --config-cache
--prefix=/home/blc/.local --program-suffix=-pgtk
--enable-checking=structs --with-file-notification=yes --with-pgtk
--with-xwidgets'
Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 MODULES NOTIFY INOTIFY
PDUMPER PGTK PNG RSVG SOUND THREADS TIFF TOOLKIT_SCROLL_BARS XIM
XWIDGETS GTK3 ZLIB
Important settings:
value of $LANG: en_IE.UTF-8
value of $XMODIFIERS: @im=ibus
locale-coding-system: utf-8-unix
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-unused-macro-build-warning-in-image.c.patch --]
[-- Type: text/x-diff, Size: 1575 bytes --]
From d60bc973c8ac840e02297931f86ebb05b50b20e6 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
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.
(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 cc97ca4d7c..09370fa833 100644
--- a/src/image.c
+++ b/src/image.c
@@ -99,7 +99,7 @@ #define BLUE16_FROM_ULONG(color) (BLUE_FROM_ULONG (color) * 0x101)
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.30.0
next reply other threads:[~2021-02-13 16:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-13 16:34 Basil L. Contovounesios [this message]
2021-02-13 23:05 ` bug#46491: [feature/pgtk] Unused macro warning in image.c without ImageMagick Alan Third
2021-02-14 2:20 ` Yuuki Harano
2021-02-14 10:03 ` Alan Third
2021-02-14 15:38 ` Eli Zaretskii
2021-02-14 2:02 ` Yuuki Harano
2021-02-14 12:33 ` Basil L. Contovounesios
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871rdksz8x.fsf@tcd.ie \
--to=contovob@tcd.ie \
--cc=46491@debbugs.gnu.org \
--cc=masm+emacs@masm11.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.