Re: GDI+ take 3

["Basil L. Contovounesios" <contovob@tcd.ie>]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

> Testing and bug reports about this new feature are welcome.

No testing, just a compiler warning:

  image.c:6240:1: warning: ‘image_can_use_native_api’ defined but not used [-Wunused-function]
   6240 | image_can_use_native_api (Lisp_Object type)
        | ^~~~~~~~~~~~~~~~~~~~~~~~

Is the following okay as a fix?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-warning-from-recent-native-image-API-changes.patch --]
[-- Type: text/x-diff, Size: 1008 bytes --]

From 31ba44075d766e3ccf0f0bf65c17e1d9944b03f5 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Tue, 14 Apr 2020 19:37:28 +0100
Subject: [PATCH] Fix warning from recent native image API changes

* src/image.c (image_can_use_native_api) [HAVE_NATIVE_IMAGE_API]:
Define static function only if it will be used.
---
 src/image.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/image.c b/src/image.c
index aacaf0b734..039fd1bd63 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6236,19 +6236,17 @@ pbm_load (struct frame *f, struct image *img)
 			    NATIVE IMAGE HANDLING
  ***********************************************************************/
 
+#if HAVE_NATIVE_IMAGE_API
 static bool
 image_can_use_native_api (Lisp_Object type)
 {
-#if HAVE_NATIVE_IMAGE_API
 # ifdef HAVE_NTGUI
   return w32_can_use_native_image_api (type);
 # else
   return false;
 # endif
-#else
-  return false;
-#endif
 }
+#endif
 
 #if HAVE_NATIVE_IMAGE_API
 
-- 
2.25.1


[-- Attachment #3: Type: text/plain, Size: 829 bytes --]


Thanks,

-- 
Basil

In GNU Emacs 28.0.50 (build 3, x86_64-pc-linux-gnu, X toolkit, cairo version 1.16.0, Xaw3d scroll bars)
 of 2020-04-14 built on thunk
Repository revision: 439e578532279507f45519c67eb84d5b7bbba8b6
Repository branch: blc/image-native-warning
Windowing system distributor 'The X.Org Foundation', version 11.0.12008000
System Description: Debian GNU/Linux bullseye/sid

Configured using:
 'configure 'CC=ccache gcc' 'CFLAGS=-O2 -march=native' --config-cache
 --prefix=/home/blc/.local --with-x-toolkit=lucid
 --with-file-notification=yes --with-x'

Configured features:
XAW3D XPM JPEG TIFF GIF PNG RSVG CAIRO SOUND GPM DBUS GSETTINGS GLIB
NOTIFY INOTIFY ACL LIBSELINUX GNUTLS LIBXML2 FREETYPE HARFBUZZ M17N_FLT
LIBOTF ZLIB TOOLKIT_SCROLL_BARS LUCID X11 XDBE XIM MODULES THREADS
LIBSYSTEMD JSON PDUMPER LCMS2 GMP