Reduce compiler warnings

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 7cd2ddd212811276a53ef132cbdef59c783d187b..30ee6bc766495c7a90d76111bb6e3321eaa336f1 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -5009,7 +5009,7 @@ static inline void PrefetchPixelCacheNexusPixels(const NexusInfo *nexus_info,
 static Quantum *SetPixelCacheNexusPixels(
   const CacheInfo *magick_restrict cache_info,const MapMode mode,
   const ssize_t x,const ssize_t y,const size_t width,const size_t height,
-  const MagickBooleanType buffered,NexusInfo *nexus_info,
+  const MagickBooleanType buffered,NexusInfo *magick_restrict nexus_info,
   ExceptionInfo *exception)
 {
   MagickBooleanType

diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c
index ff38f17dd4a619ccadc6be0ecba9d4baae327355..677de5a90b6fd67ac0a51cef302d29d774d58998 100644 (file)
--- a/MagickCore/geometry.c
+++ b/MagickCore/geometry.c
@@ -366,7 +366,7 @@ MagickExport char *GetPageGeometry(const char *page_geometry)
   typedef struct _PageInfo
   {
     const char
-      name[11];
+      name[12];
 
     size_t
       extent;

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 6ff7358eb0e6d8e655c5fa32d78eb18ac9275dac..8c2359fd57109ecbce91de14992dce2be68358a2 100644 (file)
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -1725,29 +1725,29 @@ MagickExport MagickBooleanType NTLongPathsEnabled()
         "SYSTEM\\CurrentControlSet\\Control\\FileSystem",0,KEY_READ,
         &registry_key);
       if (status != ERROR_SUCCESS)
-      {
-        RegCloseKey(registry_key);
-        long_paths_enabled=0;
-        return(MagickFalse);
-      }
-      value=(PVOID) NULL;
+        {
+          RegCloseKey(registry_key);
+          long_paths_enabled=0;
+          return(MagickFalse);
+        }
+      value=0;
       status=RegQueryValueExA(registry_key,"LongPathsEnabled",0,&type,NULL,
         NULL);
       if ((status != ERROR_SUCCESS) || (type != REG_DWORD))
-      {
-        RegCloseKey(registry_key);
-        long_paths_enabled=0;
-        return(MagickFalse);
-      }
+        {
+          RegCloseKey(registry_key);
+          long_paths_enabled=0;
+          return(MagickFalse);
+        }
       status=RegQueryValueExA(registry_key,"LongPathsEnabled",0,&type,&value,
         &size);
       RegCloseKey(registry_key);
       if (status != ERROR_SUCCESS)
-      {
-        long_paths_enabled=0;
-        return(MagickFalse);
-      }
-      long_paths_enabled=(size_t)value;
+        {
+          long_paths_enabled=0;
+          return(MagickFalse);
+        }
+      long_paths_enabled=(size_t) value;
     }
   return(long_paths_enabled == 1 ? MagickTrue : MagickFalse);
 }

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 12f92d8a154af3ebcf722cf64dc9fb18c5edcc74..b4d713cee21a8d662477830445ef4c9aad2b7f80 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -9944,6 +9944,7 @@ MagickExport Image *XImportImage(const ImageInfo *image_info,
   assert(ximage_info != (XImportInfo *) NULL);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
+  (void) ximage_info;
   (void) exception;
   return((Image *) NULL);
 }

diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index 0e3f4f418d583c0fb685b9732d9f623a392fbf9b..6041432a8206225cc34a4818bddedbea4f74c87b 100644 (file)
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -365,6 +365,7 @@ static MagickBooleanType CompositeUsage(void)
 static void GetCompositeOptions(const ImageInfo *image_info,
   CompositeOptions *composite_options)
 {
+  (void) image_info;
   (void) memset(composite_options,0,sizeof(*composite_options));
   composite_options->channel=DefaultChannels;
   composite_options->compose=OverCompositeOp;