(no commit message)

diff --git a/magick/attribute.c b/magick/attribute.c
index b0634ffa13216a2bfc8ef4e1ea27429e8fd004d3..116756f1ee1040c2a8b7f316b7d3f30ca7678752 100644 (file)
--- a/magick/attribute.c
+++ b/magick/attribute.c
@@ -328,9 +328,11 @@ MagickExport size_t GetImageChannelDepth(const Image *image,
 #endif
       for (i=0; i < (ssize_t) image->colors; i++)
       {
+        const int
+          id = GetOpenMPThreadId();
+
         if (status == MagickFalse)
           continue;
-        id=GetOpenMPThreadId();
         while (current_depth[id] < MAGICKCORE_QUANTUM_DEPTH)
         {
           MagickStatusType
@@ -369,8 +371,8 @@ MagickExport size_t GetImageChannelDepth(const Image *image,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     register const IndexPacket
       *restrict indexes;
@@ -383,7 +385,6 @@ MagickExport size_t GetImageChannelDepth(const Image *image,
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
     if (p == (const PixelPacket *) NULL)
       continue;

diff --git a/magick/cache-view.c b/magick/cache-view.c
index 09f35167f9aa150d6b28525e7371667e7f6ead28..9ce7c19072b0286d9c7a0d4db384dd33770a87f1 100644 (file)
--- a/magick/cache-view.c
+++ b/magick/cache-view.c
@@ -303,8 +303,8 @@ MagickExport ExceptionInfo *GetCacheViewException(const CacheView *cache_view)
 */
 MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
 {
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   MagickSizeType
     extent;
@@ -315,7 +315,6 @@ MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
   assert(cache_view->image->cache != (Cache) NULL);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   extent=GetPixelCacheNexusExtent(cache_view->image->cache,
     cache_view->nexus_info[id]);
@@ -388,15 +387,14 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
   const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
   ExceptionInfo *exception)
 {
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   PixelPacket
     *pixels;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
     cache_view->nexus_info[id],exception);
@@ -438,8 +436,8 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
   const CacheView *cache_view,const ssize_t x,const ssize_t y,
   PixelPacket *pixel,ExceptionInfo *exception)
 {
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   PixelPacket
     *pixels;
@@ -447,7 +445,6 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   *pixel=cache_view->image->background_color;
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,1,1,
     cache_view->nexus_info[id],exception);
@@ -483,16 +480,15 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
 */
 MagickExport IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
 {
+  const int
+    id = GetOpenMPThreadId();
+
   IndexPacket
     *indexes;
 
-  int
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   indexes=GetPixelCacheNexusIndexes(cache_view->image->cache,
     cache_view->nexus_info[id]);
@@ -526,8 +522,8 @@ MagickExport IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
 */
 MagickExport PixelPacket *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
 {
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   PixelPacket
     *pixels;
@@ -535,7 +531,6 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   pixels=GetPixelCacheNexusPixels(cache_view->image->cache,
     cache_view->nexus_info[id]);
@@ -573,13 +568,12 @@ MagickExport const IndexPacket *GetCacheViewVirtualIndexQueue(
   const IndexPacket
     *indexes;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   assert(cache_view != (const CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   indexes=GetVirtualIndexesFromNexus(cache_view->image->cache,
     cache_view->nexus_info[id]);
@@ -614,16 +608,15 @@ MagickExport const IndexPacket *GetCacheViewVirtualIndexQueue(
 MagickExport const PixelPacket *GetCacheViewVirtualPixelQueue(
   const CacheView *cache_view)
 {
+  const int
+    id = GetOpenMPThreadId();
+
   const PixelPacket
     *pixels;
 
-  int
-    id;
-
   assert(cache_view != (const CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   assert(cache_view->image->cache != (Cache) NULL);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsNexus(cache_view->image->cache,
     cache_view->nexus_info[id]);
@@ -666,15 +659,14 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixels(
   const CacheView *cache_view,const ssize_t x,const ssize_t y,
   const size_t columns,const size_t rows,ExceptionInfo *exception)
 {
+  const int
+    id = GetOpenMPThreadId();
+
   const PixelPacket
     *pixels;
 
-  int
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,
     cache_view->virtual_pixel_method,x,y,columns,rows,
@@ -718,16 +710,15 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixel(
   const CacheView *cache_view,const ssize_t x,const ssize_t y,
   PixelPacket *pixel,ExceptionInfo *exception)
 {
+  const int
+    id = GetOpenMPThreadId();
+
   const PixelPacket
     *pixels;
 
-  int
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   *pixel=cache_view->image->background_color;
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,
     cache_view->virtual_pixel_method,x,y,1,1,cache_view->nexus_info[id],
@@ -778,16 +769,15 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel(
   const CacheView *cache_view,const VirtualPixelMethod virtual_pixel_method,
   const ssize_t x,const ssize_t y,PixelPacket *pixel,ExceptionInfo *exception)
 {
+  const int
+    id = GetOpenMPThreadId();
+
   const PixelPacket
     *pixels;
 
-  int
-    id;
-
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   *pixel=cache_view->image->background_color;
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,virtual_pixel_method,x,y,1,
     1,cache_view->nexus_info[id],exception);
@@ -833,15 +823,14 @@ MagickExport PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view,
   const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
   ExceptionInfo *exception)
 {
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   PixelPacket
     *pixels;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   pixels=QueueAuthenticNexus(cache_view->image,x,y,columns,rows,
     cache_view->nexus_info[id],exception);
@@ -953,15 +942,14 @@ MagickExport MagickBooleanType SetCacheViewVirtualPixelMethod(
 MagickExport MagickBooleanType SyncCacheViewAuthenticPixels(
   CacheView *cache_view,ExceptionInfo *exception)
 {
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   MagickBooleanType
     status;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  id=GetOpenMPThreadId();
   assert(id < (int) cache_view->number_threads);
   status=SyncAuthenticPixelCacheNexus(cache_view->image,
     cache_view->nexus_info[id],exception);

diff --git a/magick/cache.c b/magick/cache.c
index b910189c4db16952491be6cffbe302fb8b4aebea..6712e187c3222408c2fac6bcd054a6c478173579 100644 (file)
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -1612,14 +1612,13 @@ static IndexPacket *GetAuthenticIndexesFromCache(const Image *image)
   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 @@ static PixelPacket *GetAuthenticPixelsFromCache(const Image *image)
   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 @@ static PixelPacket *GetAuthenticPixelsCache(Image *image,const ssize_t x,
   CacheInfo
     *cache_info;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   PixelPacket
     *pixels;
@@ -1942,7 +1940,6 @@ static PixelPacket *GetAuthenticPixelsCache(Image *image,const ssize_t x,
   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 @@ MagickExport MagickSizeType GetImageExtent(const Image *image)
   CacheInfo
     *cache_info;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   MagickSizeType
     extent;
@@ -1990,7 +1987,6 @@ MagickExport MagickSizeType GetImageExtent(const Image *image)
   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 @@ static const IndexPacket *GetVirtualIndexesFromCache(const Image *image)
   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 @@ static const PixelPacket *GetVirtualPixelCache(const Image *image,
   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 @@ static const PixelPacket *GetVirtualPixelsCache(const Image *image)
   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 @@ static PixelPacket *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
   CacheInfo
     *cache_info;
 
-  int
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   PixelPacket
     *pixels;
@@ -4399,7 +4392,6 @@ static PixelPacket *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
   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 @@ static MagickBooleanType SyncAuthenticPixelsCache(Image *image,
   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);

diff --git a/magick/distort.c b/magick/distort.c
index 6fd2bad3bf61da70db4d1d59ab6c9b7d2a2edab5..9a2aded5b457c098a2da1a136a2d42b73b00daff 100644 (file)
--- a/magick/distort.c
+++ b/magick/distort.c
@@ -1969,12 +1969,12 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
 #endif
     for (j=0; j < (ssize_t) distort_image->rows; j++)
     {
+      const int
+        id = GetOpenMPThreadId();
+
       double
         validity;  /* how mathematically valid is this the mapping */
 
-      int
-        id;
-
       MagickBooleanType
         sync;
 
@@ -2008,7 +2008,6 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
       /* Define constant scaling vectors for Affine Distortions
         Other methods are either variable, or use interpolated lookup
       */
-      id=GetOpenMPThreadId();
       switch (method)
       {
         case AffineDistortion:

diff --git a/magick/draw.c b/magick/draw.c
index ddec876ae4d858aa951c83769e7eb05299c9ae82..6b3827e54e732e2d9446a6b71b47274a2bb853d0 100644 (file)
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -1177,8 +1177,8 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
 #endif
   for (y=(ssize_t) ceil(edge.y1-0.5); y <= (ssize_t) floor(edge.y2+0.5); y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickPixelPacket
       composite,
@@ -1210,7 +1210,6 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image,
       inverse_edge.x1+0.5)+1),1,exception);
     if (q == (PixelPacket *) NULL)
       continue;
-    id=GetOpenMPThreadId();
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     pixel=zero;
     composite=zero;
@@ -3939,8 +3938,8 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
 #endif
   for (y=(ssize_t) ceil(bounds.y1-0.5); y <= (ssize_t) floor(bounds.y2+0.5); y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickRealType
       fill_opacity,
@@ -3965,7 +3964,6 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
         status=MagickFalse;
         continue;
       }
-    id=GetOpenMPThreadId();
     for (x=start; x <= stop; x++)
     {
       /*

diff --git a/magick/effect.c b/magick/effect.c
index 5cbbed35ede737d25b758b9b9d512a43c697afa8..520ca1a5fd724e17fda9d434bc5f4b03a3d54a73 100644 (file)
--- a/magick/effect.c
+++ b/magick/effect.c
@@ -1865,8 +1865,8 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
 #endif
   for (channel=0; channel <= 3; channel++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     register ssize_t
       i,
@@ -1882,7 +1882,6 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixel=pixels[id];
     (void) ResetMagickMemory(pixel,0,length*sizeof(*pixel));
     buffer=buffers[id];
@@ -2947,8 +2946,8 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius,
 #endif
   for (y=0; y < (ssize_t) median_image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     register const IndexPacket
       *restrict indexes;
@@ -2978,7 +2977,6 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius,
       }
     indexes=GetCacheViewVirtualIndexQueue(image_view);
     median_indexes=GetCacheViewAuthenticIndexQueue(median_view);
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) median_image->columns; x++)
     {
       MagickPixelPacket
@@ -4303,8 +4301,8 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius,
 #endif
   for (y=0; y < (ssize_t) noise_image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     register const IndexPacket
       *restrict indexes;
@@ -4334,7 +4332,6 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius,
       }
     indexes=GetCacheViewVirtualIndexQueue(image_view);
     noise_indexes=GetCacheViewAuthenticIndexQueue(noise_view);
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) noise_image->columns; x++)
     {
       MagickPixelPacket
@@ -5203,8 +5200,8 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
 #endif
   for (y=0; y < (ssize_t) spread_image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickPixelPacket
       pixel;
@@ -5229,7 +5226,6 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
       }
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     pixel=bias;
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) spread_image->columns; x++)
     {
       (void) ResamplePixelColor(resample_filter[id],(double) x+width*

diff --git a/magick/enhance.c b/magick/enhance.c
index 5581e1e93c35e9b8ccf9a44d72aad9e1d8410474..52f9b795259b021b69b8011bbd4e57c257c8e882 100644 (file)
--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -742,8 +742,8 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickPixelPacket
       pixel;
@@ -767,7 +767,6 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image,
       }
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
     pixel=zero;
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       /*
@@ -2324,15 +2323,15 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
+    const int
+      id = GetOpenMPThreadId();
+
     double
       offset;
 
     HaldInfo
       point;
 
-    int
-      id;
-
     MagickPixelPacket
       pixel,
       pixel1,
@@ -2363,7 +2362,6 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
     pixel2=zero;
     pixel3=zero;
     pixel4=zero;
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       point.x=QuantumScale*(level-1.0)*q->red;

diff --git a/magick/fx.c b/magick/fx.c
index d5f887db3620f0c935672926cdc8fb9de12dc4ee..1c75b30671f2ece82dc53764b2caef7153d2a85b 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -346,8 +346,8 @@ MagickExport Image *AddNoiseImageChannel(const Image *image,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickBooleanType
       sync;
@@ -379,7 +379,6 @@ MagickExport Image *AddNoiseImageChannel(const Image *image,
       }
     indexes=GetCacheViewVirtualIndexQueue(image_view);
     noise_indexes=GetCacheViewAuthenticIndexQueue(noise_view);
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)
@@ -2968,8 +2967,8 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
 #endif
   for (y=0; y < (ssize_t) fx_image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickRealType
       alpha;
@@ -2992,7 +2991,6 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
         continue;
       }
     fx_indexes=GetCacheViewAuthenticIndexQueue(fx_view);
-    id=GetOpenMPThreadId();
     alpha=0.0;
     for (x=0; x < (ssize_t) fx_image->columns; x++)
     {
@@ -3176,8 +3174,8 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickPixelPacket
       pixel;
@@ -3209,7 +3207,6 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
     implode_indexes=GetCacheViewAuthenticIndexQueue(implode_view);
     delta.y=scale.y*(double) (y-center.y);
     pixel=zero;
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       /*
@@ -4294,8 +4291,8 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
 #endif
   for (y=0; y < (ssize_t) random_image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickPixelPacket
       pixel;
@@ -4320,7 +4317,6 @@ MagickExport Image *SketchImage(const Image *image,const double radius,
       }
     indexes=GetCacheViewAuthenticIndexQueue(random_view);
     pixel=zero;
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) random_image->columns; x++)
     {
       pixel.red=(MagickRealType) (QuantumRange*
@@ -4905,8 +4901,8 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickPixelPacket
       pixel;
@@ -4938,7 +4934,6 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
     swirl_indexes=GetCacheViewAuthenticIndexQueue(swirl_view);
     delta.y=scale.y*(double) (y-center.y);
     pixel=zero;
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       /*
@@ -5376,8 +5371,8 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
 #endif
   for (y=0; y < (ssize_t) wave_image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickPixelPacket
       pixel;
@@ -5402,7 +5397,6 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
       }
     indexes=GetCacheViewAuthenticIndexQueue(wave_view);
     pixel=zero;
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) wave_image->columns; x++)
     {
       (void) ResamplePixelColor(resample_filter[id],(double) x,(double) (y-

diff --git a/magick/image-view.c b/magick/image-view.c
index 80e88534c329181da6f44483d1899f35b51274a8..1c0be0a25ca6ee7a509eed45b3ca064aa8788bdf 100644 (file)
--- a/magick/image-view.c
+++ b/magick/image-view.c
@@ -249,8 +249,8 @@ MagickExport MagickBooleanType DuplexTransferImageViewIterator(
 #endif
   for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickBooleanType
       sync;
@@ -271,7 +271,6 @@ MagickExport MagickBooleanType DuplexTransferImageViewIterator(
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewVirtualPixels(source->view,source->extent.x,y,
       source->extent.width,1,source->exception);
     if (pixels == (const PixelPacket *) NULL)
@@ -566,8 +565,8 @@ MagickExport MagickBooleanType GetImageViewIterator(ImageView *source,
 #endif
   for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     register const IndexPacket
       *indexes;
@@ -577,7 +576,6 @@ MagickExport MagickBooleanType GetImageViewIterator(ImageView *source,
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewVirtualPixels(source->view,source->extent.x,y,
       source->extent.width,1,source->exception);
     if (pixels == (const PixelPacket *) NULL)
@@ -909,8 +907,8 @@ MagickExport MagickBooleanType SetImageViewIterator(ImageView *destination,
 #endif
   for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickBooleanType
       sync;
@@ -923,7 +921,6 @@ MagickExport MagickBooleanType SetImageViewIterator(ImageView *destination,
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewAuthenticPixels(destination->view,destination->extent.x,
       y,destination->extent.width,1,exception);
     if (pixels == (PixelPacket *) NULL)
@@ -1043,8 +1040,8 @@ MagickExport MagickBooleanType TransferImageViewIterator(ImageView *source,
 #endif
   for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickBooleanType
       sync;
@@ -1063,7 +1060,6 @@ MagickExport MagickBooleanType TransferImageViewIterator(ImageView *source,
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewVirtualPixels(source->view,source->extent.x,y,
       source->extent.width,1,source->exception);
     if (pixels == (const PixelPacket *) NULL)
@@ -1182,8 +1178,8 @@ MagickExport MagickBooleanType UpdateImageViewIterator(ImageView *source,
 #endif
   for (y=source->extent.y; y < (ssize_t) source->extent.height; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     register IndexPacket
       *restrict indexes;
@@ -1193,7 +1189,6 @@ MagickExport MagickBooleanType UpdateImageViewIterator(ImageView *source,
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewAuthenticPixels(source->view,source->extent.x,y,
       source->extent.width,1,exception);
     if (pixels == (PixelPacket *) NULL)

diff --git a/magick/profile.c b/magick/profile.c
index d35c69554d34997bde0786fef507af4eb377d306..213d0f91db67081d0491e3728cef6573a1d47ceb 100644 (file)
--- a/magick/profile.c
+++ b/magick/profile.c
@@ -1222,8 +1222,8 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
 #endif
             for (y=0; y < (ssize_t) image->rows; y++)
             {
-              int
-                id;
+              const int
+                id = GetOpenMPThreadId();
 
               MagickBooleanType
                 sync;
@@ -1250,7 +1250,6 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
                   continue;
                 }
               indexes=GetCacheViewAuthenticIndexQueue(image_view);
-              id=GetOpenMPThreadId();
               p=source_pixels[id];
               for (x=0; x < (ssize_t) image->columns; x++)
               {

diff --git a/magick/quantum.c b/magick/quantum.c
index 3c43e3e26026a29c2daffef00547be360bebc585..954eda85c4dbe215db509884a1cad4a9c319239a 100644 (file)
--- a/magick/quantum.c
+++ b/magick/quantum.c
@@ -416,12 +416,11 @@ MagickExport void GetQuantumInfo(const ImageInfo *image_info,
 */
 MagickExport unsigned char *GetQuantumPixels(const QuantumInfo *quantum_info)
 {
-  ssize_t
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   assert(quantum_info != (QuantumInfo *) NULL);
   assert(quantum_info->signature == MagickSignature);
-  id=GetOpenMPThreadId();
   return(quantum_info->pixels[id]);
 }
 \f

diff --git a/magick/statistic.c b/magick/statistic.c
index 5f4e743d2630c03c2c15642dea90e25497f3e8eb..f4b261fd7fb2e67c57e94cc5ff27914a69171c7f 100644 (file)
--- a/magick/statistic.c
+++ b/magick/statistic.c
@@ -468,8 +468,8 @@ MagickExport Image *EvaluateImages(const Image *images,
     const Image
       *next;
 
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     MagickPixelPacket
       pixel;
@@ -498,7 +498,6 @@ MagickExport Image *EvaluateImages(const Image *images,
       }
     evaluate_indexes=GetCacheViewAuthenticIndexQueue(evaluate_view);
     pixel=zero;
-    id=GetOpenMPThreadId();
     evaluate_pixel=evaluate_pixels[id];
     for (x=0; x < (ssize_t) evaluate_image->columns; x++)
       evaluate_pixel[x]=zero;
@@ -624,18 +623,18 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -645,7 +644,6 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image,
         continue;
       }
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)

diff --git a/magick/threshold.c b/magick/threshold.c
index 39e43e10e28cdca87b9744e23b9a610663dd0cd6..1c4bf16970241d64ca8c906592f97355714d84d1 100644 (file)
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -1709,12 +1709,12 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
       random_info=AcquireRandomInfoThreadSet();
       image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
+      #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
 #endif
       for (y=0; y < (ssize_t) image->rows; y++)
       {
-        int
-          id;
+        const int
+          id = GetOpenMPThreadId();
 
         MagickBooleanType
           sync;
@@ -1738,7 +1738,6 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
             continue;
           }
         indexes=GetCacheViewAuthenticIndexQueue(image_view);
-        id=GetOpenMPThreadId();
         for (x=0; x < (ssize_t) image->columns; x++)
         {
           IndexPacket
@@ -1792,18 +1791,18 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    int
-      id;
+    const int
+      id = GetOpenMPThreadId();
 
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -1813,7 +1812,6 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
         continue;
       }
     indexes=GetCacheViewAuthenticIndexQueue(image_view);
-    id=GetOpenMPThreadId();
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       if ((channel & RedChannel) != 0)