diff --git a/src/logo/image/im6.c b/src/logo/image/im6.c index 6394fcde8..9694a797b 100644 --- a/src/logo/image/im6.c +++ b/src/logo/image/im6.c @@ -1,9 +1,10 @@ #ifdef FF_HAVE_IMAGEMAGICK6 #include "image.h" -#include "magickcore_wrapper.h" #include "common/library.h" +#include + 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 74c5a8d33..b0eeed2dc 100644 --- a/src/logo/image/im7.c +++ b/src/logo/image/im7.c @@ -1,9 +1,10 @@ #ifdef FF_HAVE_IMAGEMAGICK7 #include "image.h" -#include "magickcore_wrapper.h" #include "common/library.h" +#include + 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 bcd3d0d22..460ea3db0 100644 --- a/src/logo/image/image.c +++ b/src/logo/image/image.c @@ -265,7 +265,11 @@ 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 -#include "magickcore_wrapper.h" +#ifdef FF_HAVE_IMAGEMAGICK7 + #include +#else + #include +#endif typedef struct ImageData { diff --git a/src/logo/image/magickcore_wrapper.h b/src/logo/image/magickcore_wrapper.h deleted file mode 100644 index 6f4314c71..000000000 --- a/src/logo/image/magickcore_wrapper.h +++ /dev/null @@ -1,13 +0,0 @@ -#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 -#elif defined(FF_HAVE_IMAGEMAGICK6) - #include -#endif - -#pragma GCC diagnostic pop