commit 83e6d2a4a04b4919c6834919e538480daaf20611
author cristy <urban-warrior@git.imagemagick.org> Fri Sep 17 17:35:13 2010 +0000
committer cristy <urban-warrior@git.imagemagick.org> Fri Sep 17 17:35:13 2010 +0000
tree 91e3e8cf8882eda060261c30ecb1c467b0dd386a
parent 5c9e6f2ec2e7738ede83902931da0f80db60f565

wand/deprecate.c

diff --git a/wand/deprecate.c b/wand/deprecate.c
index 581ba57..521091e 100644
--- a/wand/deprecate.c
+++ b/wand/deprecate.c
@@ -365,6 +365,9 @@
 #endif
   for (y=source->region.y; y < (ssize_t) source->region.height; y++)
   {
+    const int
+      id = GetOpenMPThreadId();
+
     MagickBooleanType
       sync;
 
@@ -380,7 +383,6 @@
       *restrict destination_indexes;
 
     register ssize_t
-      id,
       x;
 
     register PixelPacket
@@ -388,7 +390,6 @@
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewVirtualPixels(source->view,source->region.x,y,
       source->region.width,1,source->exception);
     if (pixels == (const PixelPacket *) NULL)
@@ -627,6 +628,9 @@
 #endif
   for (y=source->region.y; y < (ssize_t) source->region.height; y++)
   {
+    const int
+      id = GetOpenMPThreadId();
+
     register const IndexPacket
       *indexes;
 
@@ -634,12 +638,10 @@
       *pixels;
 
     register ssize_t
-      id,
       x;
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewVirtualPixels(source->view,source->region.x,y,
       source->region.width,1,source->exception);
     if (pixels == (const PixelPacket *) NULL)
@@ -699,12 +701,11 @@
 */
 WandExport PixelWand **GetPixelViewPixels(const PixelView *pixel_view)
 {
-  ssize_t
-    id;
+  const int
+    id = GetOpenMPThreadId();
 
   assert(pixel_view != (PixelView *) NULL);
   assert(pixel_view->signature == WandSignature);
-  id=GetOpenMPThreadId();
   return(pixel_view->pixel_wands[id]);
 }
 
@@ -2577,6 +2578,9 @@
 #endif
   for (y=destination->region.y; y < (ssize_t) destination->region.height; y++)
   {
+    const int
+      id = GetOpenMPThreadId();
+
     MagickBooleanType
       sync;
 
@@ -2584,7 +2588,6 @@
       *restrict indexes;
 
     register ssize_t
-      id,
       x;
 
     register PixelPacket
@@ -2592,7 +2595,6 @@
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewAuthenticPixels(destination->view,destination->region.x,
       y,destination->region.width,1,exception);
     if (pixels == (PixelPacket *) NULL)
@@ -2713,6 +2715,9 @@
 #endif
   for (y=source->region.y; y < (ssize_t) source->region.height; y++)
   {
+    const int
+      id = GetOpenMPThreadId();
+
     MagickBooleanType
       sync;
 
@@ -2726,7 +2731,6 @@
       *restrict destination_indexes;
 
     register ssize_t
-      id,
       x;
 
     register PixelPacket
@@ -2734,7 +2738,6 @@
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewVirtualPixels(source->view,source->region.x,y,
       source->region.width,1,source->exception);
     if (pixels == (const PixelPacket *) NULL)
@@ -2873,6 +2876,9 @@
 #endif
   for (y=source->region.y; y < (ssize_t) source->region.height; y++)
   {
+    const int
+      id = GetOpenMPThreadId();
+
     register IndexPacket
       *restrict indexes;
 
@@ -2885,7 +2891,6 @@
 
     if (status == MagickFalse)
       continue;
-    id=GetOpenMPThreadId();
     pixels=GetCacheViewAuthenticPixels(source->view,source->region.x,y,
       source->region.width,1,exception);
     if (pixels == (PixelPacket *) NULL)