From afa0a7dac8bd3fcdd5ae29baf7966536ba64daed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Mon, 15 Jan 2024 09:13:14 +0800
Subject: [PATCH] Image: silence compiler warnings

---
 src/logo/image/im6.c                |  3 +--
 src/logo/image/im7.c                |  3 +--
 src/logo/image/image.c              |  6 +-----
 src/logo/image/magickcore_wrapper.h | 13 +++++++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 src/logo/image/magickcore_wrapper.h

diff --git a/src/logo/image/im6.c b/src/logo/image/im6.c
index 9694a797b..6394fcde8 100644
--- a/src/logo/image/im6.c
+++ b/src/logo/image/im6.c
@@ -1,10 +1,9 @@
 #ifdef FF_HAVE_IMAGEMAGICK6
 
 #include "image.h"
+#include "magickcore_wrapper.h"
 #include "common/library.h"
 
-#include <magick/MagickCore.h>
-
 static FF_LIBRARY_SYMBOL(ResizeImage)
 
 static void* logoResize(const void* image, size_t width, size_t height, void* exceptionInfo)
diff --git a/src/logo/image/im7.c b/src/logo/image/im7.c
index b0eeed2dc..74c5a8d33 100644
--- a/src/logo/image/im7.c
+++ b/src/logo/image/im7.c
@@ -1,10 +1,9 @@
 #ifdef FF_HAVE_IMAGEMAGICK7
 
 #include "image.h"
+#include "magickcore_wrapper.h"
 #include "common/library.h"
 
-#include <MagickCore/MagickCore.h>
-
 static FF_LIBRARY_SYMBOL(ResizeImage)
 
 static void* logoResize(const void* image, size_t width, size_t height, void* exceptionInfo)
diff --git a/src/logo/image/image.c b/src/logo/image/image.c
index 460ea3db0..bcd3d0d22 100644
--- a/src/logo/image/image.c
+++ b/src/logo/image/image.c
@@ -265,11 +265,7 @@ static bool compressBlob(void** blob, size_t* length)
 #endif // FF_HAVE_ZLIB
 
 //We use only the defines from here, that are exactly the same in both versions
-#ifdef FF_HAVE_IMAGEMAGICK7
-    #include <MagickCore/MagickCore.h>
-#else
-    #include <magick/MagickCore.h>
-#endif
+#include "magickcore_wrapper.h"
 
 typedef struct ImageData
 {
diff --git a/src/logo/image/magickcore_wrapper.h b/src/logo/image/magickcore_wrapper.h
new file mode 100644
index 000000000..6f4314c71
--- /dev/null
+++ b/src/logo/image/magickcore_wrapper.h
@@ -0,0 +1,13 @@
+#pragma once
+
+// ImageMagick-7/MagickCore/pixel-accessor.h:518:46: warning: implicit conversion from 'QuantumAny' (aka 'unsigned long long') to 'double' may lose precision
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wimplicit-int-float-conversion"
+
+#ifdef FF_HAVE_IMAGEMAGICK7
+    #include <MagickCore/MagickCore.h>
+#elif defined(FF_HAVE_IMAGEMAGICK6)
+    #include <magick/MagickCore.h>
+#endif
+
+#pragma GCC diagnostic pop