From 1b04b8317378589d1c3a2fddecf30ef1f7cf2c80 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Fri, 15 Oct 2021 09:46:32 +0200 Subject: [PATCH] Silenced warnings. --- MagickCore/color.c | 2 ++ MagickCore/configure.c | 3 +++ MagickCore/delegate.c | 2 ++ MagickCore/locale.c | 2 ++ MagickCore/log.c | 2 ++ MagickCore/mime.c | 3 +++ MagickCore/opencl.c | 11 ++++++----- MagickCore/type.c | 2 ++ 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/MagickCore/color.c b/MagickCore/color.c index 6ea609bb9e..4916ec0db6 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -865,6 +865,8 @@ static LinkedListInfo *AcquireColorCache(const char *filename, } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); #endif /* Load built-in color map. diff --git a/MagickCore/configure.c b/MagickCore/configure.c index 02d2daa0d5..a08063185b 100644 --- a/MagickCore/configure.c +++ b/MagickCore/configure.c @@ -186,6 +186,9 @@ static LinkedListInfo *AcquireConfigureCache(const char *filename, } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); + magick_unreferenced(exception); #endif /* Load built-in configure. diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c index bd1a2d9fde..f0bd85d528 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -225,6 +225,8 @@ static LinkedListInfo *AcquireDelegateCache(const char *filename, } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); #endif if (IsLinkedListEmpty(cache) != MagickFalse) (void) LoadDelegateCache(cache,DelegateMap,"built-in",0,exception); diff --git a/MagickCore/locale.c b/MagickCore/locale.c index 86b0702de6..50842f5a86 100644 --- a/MagickCore/locale.c +++ b/MagickCore/locale.c @@ -222,6 +222,8 @@ static SplayTreeInfo *AcquireLocaleSplayTree(const char *filename, options=DestroyLocaleOptions(options); } } +#else + magick_unreferenced(filename); #endif if (GetNumberOfNodesInSplayTree(cache) == 0) (void) LoadLocaleCache(cache,LocaleMap,"built-in",locale,0, diff --git a/MagickCore/log.c b/MagickCore/log.c index 1e35b4ddba..ae74ddb543 100644 --- a/MagickCore/log.c +++ b/MagickCore/log.c @@ -299,6 +299,8 @@ static LinkedListInfo *AcquireLogCache(const char *filename, } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); #endif /* Load built-in log map. diff --git a/MagickCore/mime.c b/MagickCore/mime.c index bc9cf24e93..1cf1d9e4ff 100644 --- a/MagickCore/mime.c +++ b/MagickCore/mime.c @@ -177,6 +177,9 @@ MagickExport LinkedListInfo *AcquireMimeCache(const char *filename, } options=DestroyConfigureOptions(options); } +#else + magick_unreferenced(filename); + magick_unreferenced(exception); #endif return(cache); } diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c index 975500e657..ea5b415221 100644 --- a/MagickCore/opencl.c +++ b/MagickCore/opencl.c @@ -936,15 +936,13 @@ static MagickBooleanType CanWriteProfileToFile(const char *filename) static MagickBooleanType LoadOpenCLBenchmarks(MagickCLEnv clEnv) { +#if !MAGICKCORE_ZERO_CONFIGURATION_SUPPORT char filename[MagickPathExtent]; StringInfo *option; - size_t - i; - (void) FormatLocaleString(filename,MagickPathExtent,"%s%s%s", GetOpenCLCacheDirectory(),DirectorySeparator,IMAGEMAGICK_PROFILE_FILE); @@ -952,21 +950,24 @@ static MagickBooleanType LoadOpenCLBenchmarks(MagickCLEnv clEnv) We don't run the benchmark when we can not write out a device profile. The first GPU device will be used. */ -#if !MAGICKCORE_ZERO_CONFIGURATION_SUPPORT if (CanWriteProfileToFile(filename) == MagickFalse) #endif { + size_t + i; + for (i = 0; i < clEnv->number_devices; i++) clEnv->devices[i]->score=1.0; SelectOpenCLDevice(clEnv,CL_DEVICE_TYPE_GPU); return(MagickFalse); } - +#if !MAGICKCORE_ZERO_CONFIGURATION_SUPPORT option=ConfigureFileToStringInfo(filename); LoadOpenCLDeviceBenchmark(clEnv,(const char *) GetStringInfoDatum(option)); option=DestroyStringInfo(option); return(MagickTrue); +#endif } static void AutoSelectOpenCLDevices(MagickCLEnv clEnv) diff --git a/MagickCore/type.c b/MagickCore/type.c index 1ee8dd1127..23b196d86e 100644 --- a/MagickCore/type.c +++ b/MagickCore/type.c @@ -238,6 +238,8 @@ static SplayTreeInfo *AcquireTypeCache(const char *filename, font_path=DestroyString(font_path); } } +#else + magick_unreferenced(filename); #endif if (GetNumberOfNodesInSplayTree(cache) == 0) (void) LoadTypeCache(cache,TypeMap,"built-in",0,exception);