From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 25 Jul 2015 01:48:02 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~761
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4167f3a934b7c75a501ac7b4f1ceaf3e1bb192fd;p=imagemagick

---

diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c
index 0ce45fdf8..78c542285 100644
--- a/MagickCore/fourier.c
+++ b/MagickCore/fourier.c
@@ -115,8 +115,8 @@ typedef struct _FourierInfo
 %
 %  The format of the ComplexImages method is:
 %
-%      MagickBooleanType ComplexImages(Image *images,
-%        const ComplexOperator op,ExceptionInfo *exception)
+%      MagickBooleanType ComplexImages(Image *images,const ComplexOperator op,
+%        ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -229,8 +229,8 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,
   status=MagickTrue;
   progress=0;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-    #pragma omp parallel for schedule(static,4) shared(progress,status) \
-      magick_threads(images,complex_images,images->rows,1L)
+  #pragma omp parallel for schedule(static,4) shared(progress,status) \
+    magick_threads(images,complex_images,images->rows,1L)
 #endif
   for (y=0; y < (ssize_t) images->rows; y++)
   {
@@ -249,12 +249,12 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,
 
     if (status == MagickFalse)
       continue;
-    Ar=GetCacheViewVirtualPixels(Ar_view,0,y,images->columns,1,exception);
-    Ai=GetCacheViewVirtualPixels(Ai_view,0,y,images->columns,1,exception);
-    Br=GetCacheViewVirtualPixels(Br_view,0,y,images->columns,1,exception);
-    Bi=GetCacheViewVirtualPixels(Bi_view,0,y,images->columns,1,exception);
-    Cr=QueueCacheViewAuthenticPixels(Cr_view,0,y,images->columns,1,exception);
-    Ci=QueueCacheViewAuthenticPixels(Ci_view,0,y,images->columns,1,exception);
+    Ar=GetCacheViewVirtualPixels(Ar_view,0,y,Ar_image->columns,1,exception);
+    Ai=GetCacheViewVirtualPixels(Ai_view,0,y,Ai_image->columns,1,exception);
+    Br=GetCacheViewVirtualPixels(Br_view,0,y,Br_image->columns,1,exception);
+    Bi=GetCacheViewVirtualPixels(Bi_view,0,y,Bi_image->columns,1,exception);
+    Cr=QueueCacheViewAuthenticPixels(Cr_view,0,y,Cr_image->columns,1,exception);
+    Ci=QueueCacheViewAuthenticPixels(Ci_view,0,y,Ci_image->columns,1,exception);
     if ((Ar == (const Quantum *) NULL) || (Ai == (const Quantum *) NULL) || 
         (Br == (const Quantum *) NULL) || (Bi == (const Quantum *) NULL) ||
         (Cr == (Quantum *) NULL) || (Ci == (Quantum *) NULL))
@@ -319,13 +319,13 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,
             break;
           }
         }
-        Ar+=GetPixelChannels(Ar_image);
-        Ai+=GetPixelChannels(Ai_image);
-        Br+=GetPixelChannels(Br_image);
-        Bi+=GetPixelChannels(Bi_image);
-        Cr+=GetPixelChannels(Cr_image);
-        Ci+=GetPixelChannels(Ci_image);
       }
+      Ar+=GetPixelChannels(Ar_image);
+      Ai+=GetPixelChannels(Ai_image);
+      Br+=GetPixelChannels(Br_image);
+      Bi+=GetPixelChannels(Bi_image);
+      Cr+=GetPixelChannels(Cr_image);
+      Ci+=GetPixelChannels(Ci_image);
     }
     if (SyncCacheViewAuthenticPixels(Ci_view,exception) == MagickFalse)
       status=MagickFalse;