commit 5c9e6f2ec2e7738ede83902931da0f80db60f565
author cristy <urban-warrior@git.imagemagick.org> Fri Sep 17 17:31:01 2010 +0000
committer cristy <urban-warrior@git.imagemagick.org> Fri Sep 17 17:31:01 2010 +0000
tree 874f2b9673b31382a7a988ef2355c2a3b83cbeb7
parent ed733b30770998f36701cccf1c43e7da8cfbb635

magick/cache.c

diff --git a/magick/cache.c b/magick/cache.c
index b910189..6712e18 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -1612,14 +1612,13 @@
   CacheInfo
     *cache_info;
 
+  const int
+    id = GetOpenMPThreadId();
+
   IndexPacket
     *indexes;
 
-  int
-    id;
-
   cache_info=(CacheInfo *) image->cache;
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_info->number_threads);
   indexes=GetPixelCacheNexusIndexes(image->cache,cache_info->nexus_info[id]);
   return(indexes);
@@ -1774,14 +1773,13 @@
   CacheInfo
     *cache_info;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   PixelPacket
     *pixels;
 
   cache_info=(CacheInfo *) image->cache;
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_info->number_threads);
   pixels=GetPixelCacheNexusPixels(image->cache,cache_info->nexus_info[id]);
   return(pixels);
@@ -1933,8 +1931,8 @@
   CacheInfo
     *cache_info;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   PixelPacket
     *pixels;
@@ -1942,7 +1940,6 @@
   cache_info=(CacheInfo *) image->cache;
   if (cache_info == (Cache) NULL)
     return((PixelPacket *) NULL);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_info->number_threads);
   pixels=GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
     cache_info->nexus_info[id],exception);
@@ -1977,8 +1974,8 @@
   CacheInfo
     *cache_info;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   MagickSizeType
     extent;
@@ -1990,7 +1987,6 @@
   assert(image->cache != (Cache) NULL);
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_info->number_threads);
   extent=GetPixelCacheNexusExtent(image->cache,cache_info->nexus_info[id]);
   return(extent);
@@ -2921,11 +2917,10 @@
   const IndexPacket
     *indexes;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   cache_info=(CacheInfo *) image->cache;
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_info->number_threads);
   indexes=GetVirtualIndexesFromNexus(image->cache,cache_info->nexus_info[id]);
   return(indexes);
@@ -3511,14 +3506,13 @@
   CacheInfo
    *cache_info;
 
+  const int
+    id = GetOpenMPThreadId();
+
   const PixelPacket
     *pixels;
 
-  int
-    id;
-
   cache_info=(CacheInfo *) image->cache;
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_info->number_threads);
   pixels=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,columns,rows,
     cache_info->nexus_info[id],exception);
@@ -3663,14 +3657,13 @@
   CacheInfo
     *cache_info;
 
+  const int
+    id = GetOpenMPThreadId();
+
   const PixelPacket
     *pixels;
 
-  int
-    id;
-
   cache_info=(CacheInfo *) image->cache;
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_info->number_threads);
   pixels=GetVirtualPixelsNexus(image->cache,cache_info->nexus_info[id]);
   return(pixels);
@@ -4390,8 +4383,8 @@
   CacheInfo
     *cache_info;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   PixelPacket
     *pixels;
@@ -4399,7 +4392,6 @@
   cache_info=(CacheInfo *) image->cache;
   if (cache_info == (Cache) NULL)
     return((PixelPacket *) NULL);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_info->number_threads);
   pixels=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
     exception);
@@ -5157,14 +5149,13 @@
   CacheInfo
     *cache_info;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   MagickBooleanType
     status;
 
   cache_info=(CacheInfo *) image->cache;
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_info->number_threads);
   status=SyncAuthenticPixelCacheNexus(image,cache_info->nexus_info[id],
     exception);