From f54fb57c0715ef82472726c85bd0c09b210849d3 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 17 Sep 2010 20:08:14 +0000
Subject: [PATCH]

---
 magick/cache-view.c | 72 ++++++++++++---------------------------------
 magick/cache.c      | 62 ++++++++------------------------------
 2 files changed, 31 insertions(+), 103 deletions(-)

diff --git a/magick/cache-view.c b/magick/cache-view.c
index 9ce7c1907..4982efece 100644
--- a/magick/cache-view.c
+++ b/magick/cache-view.c
@@ -306,9 +306,6 @@ MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
   const int
     id = GetOpenMPThreadId();
 
-  MagickSizeType
-    extent;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   if (cache_view->debug != MagickFalse)
@@ -316,9 +313,8 @@ MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
       cache_view->image->filename);
   assert(cache_view->image->cache != (Cache) NULL);
   assert(id < (int) cache_view->number_threads);
-  extent=GetPixelCacheNexusExtent(cache_view->image->cache,
-    cache_view->nexus_info[id]);
-  return(extent);
+  return(GetPixelCacheNexusExtent(cache_view->image->cache,
+    cache_view->nexus_info[id]));
 }
 
 /*
@@ -390,15 +386,11 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
   const int
     id = GetOpenMPThreadId();
 
-  PixelPacket
-    *pixels;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(id < (int) cache_view->number_threads);
-  pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
-    cache_view->nexus_info[id],exception);
-  return(pixels);
+  return(GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
+    cache_view->nexus_info[id],exception));
 }
 
 /*
@@ -483,16 +475,12 @@ MagickExport IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
   const int
     id = GetOpenMPThreadId();
 
-  IndexPacket
-    *indexes;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   assert(id < (int) cache_view->number_threads);
-  indexes=GetPixelCacheNexusIndexes(cache_view->image->cache,
-    cache_view->nexus_info[id]);
-  return(indexes);
+  return(GetPixelCacheNexusIndexes(cache_view->image->cache,
+    cache_view->nexus_info[id]));
 }
 
 /*
@@ -525,16 +513,12 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
   const int
     id = GetOpenMPThreadId();
 
-  PixelPacket
-    *pixels;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   assert(id < (int) cache_view->number_threads);
-  pixels=GetPixelCacheNexusPixels(cache_view->image->cache,
-    cache_view->nexus_info[id]);
-  return(pixels);
+  return(GetPixelCacheNexusPixels(cache_view->image->cache,
+    cache_view->nexus_info[id]));
 }
 
 /*
@@ -565,9 +549,6 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
 MagickExport const IndexPacket *GetCacheViewVirtualIndexQueue(
   const CacheView *cache_view)
 {
-  const IndexPacket
-    *indexes;
-
   const int
     id = GetOpenMPThreadId();
 
@@ -575,9 +556,8 @@ MagickExport const IndexPacket *GetCacheViewVirtualIndexQueue(
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   assert(id < (int) cache_view->number_threads);
-  indexes=GetVirtualIndexesFromNexus(cache_view->image->cache,
-    cache_view->nexus_info[id]);
-  return(indexes);
+  return(GetVirtualIndexesFromNexus(cache_view->image->cache,
+    cache_view->nexus_info[id]));
 }
 
 /*
@@ -611,16 +591,12 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixelQueue(
   const int
     id = GetOpenMPThreadId();
 
-  const PixelPacket
-    *pixels;
-
   assert(cache_view != (const CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   assert(id < (int) cache_view->number_threads);
-  pixels=GetVirtualPixelsNexus(cache_view->image->cache,
-    cache_view->nexus_info[id]);
-  return(pixels);
+  return(GetVirtualPixelsNexus(cache_view->image->cache,
+    cache_view->nexus_info[id]));
 }
 
 /*
@@ -662,16 +638,12 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixels(
   const int
     id = GetOpenMPThreadId();
 
-  const PixelPacket
-    *pixels;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(id < (int) cache_view->number_threads);
-  pixels=GetVirtualPixelsFromNexus(cache_view->image,
+  return(GetVirtualPixelsFromNexus(cache_view->image,
     cache_view->virtual_pixel_method,x,y,columns,rows,
-    cache_view->nexus_info[id],exception);
-  return(pixels);
+    cache_view->nexus_info[id],exception));
 }
 
 /*
@@ -826,15 +798,11 @@ MagickExport PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view,
   const int
     id = GetOpenMPThreadId();
 
-  PixelPacket
-    *pixels;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(id < (int) cache_view->number_threads);
-  pixels=QueueAuthenticNexus(cache_view->image,x,y,columns,rows,
-    cache_view->nexus_info[id],exception);
-  return(pixels);
+  return(QueueAuthenticNexus(cache_view->image,x,y,columns,rows,
+    cache_view->nexus_info[id],exception));
 }
 
 /*
@@ -945,13 +913,9 @@ MagickExport MagickBooleanType SyncCacheViewAuthenticPixels(
   const int
     id = GetOpenMPThreadId();
 
-  MagickBooleanType
-    status;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(id < (int) cache_view->number_threads);
-  status=SyncAuthenticPixelCacheNexus(cache_view->image,
-    cache_view->nexus_info[id],exception);
-  return(status);
+  return(SyncAuthenticPixelCacheNexus(cache_view->image,
+    cache_view->nexus_info[id],exception));
 }
diff --git a/magick/cache.c b/magick/cache.c
index 6712e187c..bf0cea89e 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -1615,13 +1615,9 @@ static IndexPacket *GetAuthenticIndexesFromCache(const Image *image)
   const int
     id = GetOpenMPThreadId();
 
-  IndexPacket
-    *indexes;
-
   cache_info=(CacheInfo *) image->cache;
   assert(id < (int) cache_info->number_threads);
-  indexes=GetPixelCacheNexusIndexes(image->cache,cache_info->nexus_info[id]);
-  return(indexes);
+  return(GetPixelCacheNexusIndexes(image->cache,cache_info->nexus_info[id]));
 }
 
 /*
@@ -1776,13 +1772,9 @@ static PixelPacket *GetAuthenticPixelsFromCache(const Image *image)
   const int
     id = GetOpenMPThreadId();
 
-  PixelPacket
-    *pixels;
-
   cache_info=(CacheInfo *) image->cache;
   assert(id < (int) cache_info->number_threads);
-  pixels=GetPixelCacheNexusPixels(image->cache,cache_info->nexus_info[id]);
-  return(pixels);
+  return(GetPixelCacheNexusPixels(image->cache,cache_info->nexus_info[id]));
 }
 
 /*
@@ -1934,16 +1926,12 @@ static PixelPacket *GetAuthenticPixelsCache(Image *image,const ssize_t x,
   const int
     id = GetOpenMPThreadId();
 
-  PixelPacket
-    *pixels;
-
   cache_info=(CacheInfo *) image->cache;
   if (cache_info == (Cache) NULL)
     return((PixelPacket *) NULL);
   assert(id < (int) cache_info->number_threads);
-  pixels=GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
-    cache_info->nexus_info[id],exception);
-  return(pixels);
+  return(GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
+    cache_info->nexus_info[id],exception));
 }
 
 /*
@@ -1977,9 +1965,6 @@ MagickExport MagickSizeType GetImageExtent(const Image *image)
   const int
     id = GetOpenMPThreadId();
 
-  MagickSizeType
-    extent;
-
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
@@ -1988,8 +1973,7 @@ MagickExport MagickSizeType GetImageExtent(const Image *image)
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
   assert(id < (int) cache_info->number_threads);
-  extent=GetPixelCacheNexusExtent(image->cache,cache_info->nexus_info[id]);
-  return(extent);
+  return(GetPixelCacheNexusExtent(image->cache,cache_info->nexus_info[id]));
 }
 
 /*
@@ -2914,16 +2898,12 @@ static const IndexPacket *GetVirtualIndexesFromCache(const Image *image)
   CacheInfo
     *cache_info;
 
-  const IndexPacket
-    *indexes;
-
   const int
     id = GetOpenMPThreadId();
 
   cache_info=(CacheInfo *) image->cache;
   assert(id < (int) cache_info->number_threads);
-  indexes=GetVirtualIndexesFromNexus(image->cache,cache_info->nexus_info[id]);
-  return(indexes);
+  return(GetVirtualIndexesFromNexus(image->cache,cache_info->nexus_info[id]));
 }
 
 /*
@@ -3509,14 +3489,10 @@ static const PixelPacket *GetVirtualPixelCache(const Image *image,
   const int
     id = GetOpenMPThreadId();
 
-  const PixelPacket
-    *pixels;
-
   cache_info=(CacheInfo *) image->cache;
   assert(id < (int) cache_info->number_threads);
-  pixels=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,columns,rows,
-    cache_info->nexus_info[id],exception);
-  return(pixels);
+  return(GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,columns,rows,
+    cache_info->nexus_info[id],exception));
 }
 
 /*
@@ -3660,13 +3636,9 @@ static const PixelPacket *GetVirtualPixelsCache(const Image *image)
   const int
     id = GetOpenMPThreadId();
 
-  const PixelPacket
-    *pixels;
-
   cache_info=(CacheInfo *) image->cache;
   assert(id < (int) cache_info->number_threads);
-  pixels=GetVirtualPixelsNexus(image->cache,cache_info->nexus_info[id]);
-  return(pixels);
+  return(GetVirtualPixelsNexus(image->cache,cache_info->nexus_info[id]));
 }
 
 /*
@@ -4386,16 +4358,12 @@ static PixelPacket *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
   const int
     id = GetOpenMPThreadId();
 
-  PixelPacket
-    *pixels;
-
   cache_info=(CacheInfo *) image->cache;
   if (cache_info == (Cache) NULL)
     return((PixelPacket *) NULL);
   assert(id < (int) cache_info->number_threads);
-  pixels=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
-    exception);
-  return(pixels);
+  return(QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
+    exception));
 }
 
 /*
@@ -5152,14 +5120,10 @@ static MagickBooleanType SyncAuthenticPixelsCache(Image *image,
   const int
     id = GetOpenMPThreadId();
 
-  MagickBooleanType
-    status;
-
   cache_info=(CacheInfo *) image->cache;
   assert(id < (int) cache_info->number_threads);
-  status=SyncAuthenticPixelCacheNexus(image,cache_info->nexus_info[id],
-    exception);
-  return(status);
+  return(SyncAuthenticPixelCacheNexus(image,cache_info->nexus_info[id],
+    exception));
 }
 
 /*
-- 
2.40.0