(no commit message)

[imagemagick] / MagickCore / effect.c

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 95babc68972cbdc2149e0dfcb13ce5698ff6f917..21810c64b72bcfed634347f22088d5aa9bed44eb 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -357,13 +357,6 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius,
           gamma,
           pixel;
 
-        PixelChannel
-          channel;
-
-        PixelTrait
-          blur_traits,
-          traits;
-
         register const MagickRealType
           *restrict k;
 
@@ -376,9 +369,9 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius,
         ssize_t
           v;
 
-        channel=GetPixelChannelChannel(image,i);
-        traits=GetPixelChannelTraits(image,channel);
-        blur_traits=GetPixelChannelTraits(blur_image,channel);
+        PixelChannel channel=GetPixelChannelChannel(image,i);
+        PixelTrait traits=GetPixelChannelTraits(image,channel);
+        PixelTrait blur_traits=GetPixelChannelTraits(blur_image,channel);
         if ((traits == UndefinedPixelTrait) ||
             (blur_traits == UndefinedPixelTrait))
           continue;
@@ -392,7 +385,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius,
         pixels=p;
         pixel=0.0;
         gamma=0.0;
-        if ((blur_traits & BlendPixelTrait) == 0)
+        if ((GetPixelAlphaTraits(blur_image) & BlendPixelTrait) == 0)
           {
             /*
               No alpha blending.
@@ -682,13 +675,6 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius,
           gamma,
           pixel;
 
-        PixelChannel
-          channel;
-
-        PixelTrait
-          sharp_traits,
-          traits;
-
         register const MagickRealType
           *restrict k;
 
@@ -701,9 +687,9 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius,
         ssize_t
           v;
 
-        channel=GetPixelChannelChannel(image,i);
-        traits=GetPixelChannelTraits(image,channel);
-        sharp_traits=GetPixelChannelTraits(sharp_image,channel);
+        PixelChannel channel=GetPixelChannelChannel(image,i);
+        PixelTrait traits=GetPixelChannelTraits(image,channel);
+        PixelTrait sharp_traits=GetPixelChannelTraits(sharp_image,channel);
         if ((traits == UndefinedPixelTrait) ||
             (sharp_traits == UndefinedPixelTrait))
           continue;
@@ -717,7 +703,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius,
         pixels=p;
         pixel=0.0;
         gamma=0.0;
-        if ((sharp_traits & BlendPixelTrait) == 0)
+        if ((GetPixelAlphaTraits(sharp_image) & BlendPixelTrait) == 0)
           {
             /*
               No alpha blending.
@@ -902,7 +888,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickSignature);
-  blur_image=CloneImage(image,0,0,MagickTrue,exception);
+  blur_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
   if (blur_image == (Image *) NULL)
     return((Image *) NULL);
   if (fabs(sigma) < MagickEpsilon)
@@ -989,13 +975,6 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
           gamma,
           pixel;
 
-        PixelChannel
-          channel;
-
-        PixelTrait
-          blur_traits,
-          traits;
-
         register const MagickRealType
           *restrict k;
 
@@ -1005,9 +984,9 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
         register ssize_t
           u;
 
-        channel=GetPixelChannelChannel(image,i);
-        traits=GetPixelChannelTraits(image,channel);
-        blur_traits=GetPixelChannelTraits(blur_image,channel);
+        PixelChannel channel=GetPixelChannelChannel(image,i);
+        PixelTrait traits=GetPixelChannelTraits(image,channel);
+        PixelTrait blur_traits=GetPixelChannelTraits(blur_image,channel);
         if ((traits == UndefinedPixelTrait) ||
             (blur_traits == UndefinedPixelTrait))
           continue;
@@ -1020,7 +999,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
         k=kernel;
         pixels=p;
         pixel=0.0;
-        if ((blur_traits & BlendPixelTrait) == 0)
+        if ((GetPixelAlphaTraits(blur_image) & BlendPixelTrait) == 0)
           {
             /*
               No alpha blending.
@@ -1078,7 +1057,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
   blur_view=AcquireAuthenticCacheView(blur_image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(progress,status) \
-    magick_threads(image,blur_image,image->columns,1)
+    magick_threads(blur_image,blur_image,blur_image->columns,1)
 #endif
   for (x=0; x < (ssize_t) blur_image->columns; x++)
   {
@@ -1113,13 +1092,6 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
           gamma,
           pixel;
 
-        PixelChannel
-          channel;
-
-        PixelTrait
-          blur_traits,
-          traits;
-
         register const MagickRealType
           *restrict k;
 
@@ -1129,14 +1101,14 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
         register ssize_t
           u;
 
-        channel=GetPixelChannelChannel(blur_image,i);
-        traits=GetPixelChannelTraits(blur_image,channel);
-        blur_traits=GetPixelChannelTraits(blur_image,channel);
+        PixelChannel channel=GetPixelChannelChannel(blur_image,i);
+        PixelTrait traits=GetPixelChannelTraits(blur_image,channel);
+        PixelTrait blur_traits=GetPixelChannelTraits(blur_image,channel);
         if ((traits == UndefinedPixelTrait) ||
             (blur_traits == UndefinedPixelTrait))
           continue;
         if (((blur_traits & CopyPixelTrait) != 0) ||
-            (GetPixelMask(image,p) != 0))
+            (GetPixelMask(blur_image,p) != 0))
           {
             SetPixelChannel(blur_image,channel,p[center+i],q);
             continue;
@@ -1144,7 +1116,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
         k=kernel;
         pixels=p;
         pixel=0.0;
-        if ((blur_traits & BlendPixelTrait) == 0)
+        if ((GetPixelAlphaTraits(blur_image) & BlendPixelTrait) == 0)
           {
             /*
               No alpha blending.
@@ -1164,8 +1136,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius,
         gamma=0.0;
         for (u=0; u < (ssize_t) width; u++)
         {
-          alpha=(double) (QuantumScale*GetPixelAlpha(blur_image,
-            pixels));
+          alpha=(double) (QuantumScale*GetPixelAlpha(blur_image,pixels));
           pixel+=(*k)*alpha*pixels[i];
           gamma+=(*k)*alpha;
           k++;
@@ -1283,8 +1254,8 @@ static void Hull(const Image *image,const ssize_t x_offset,
   q=g+(columns+2);
   r=p+(y_offset*(columns+2)+x_offset);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static) \
-    magick_threads(image,image,rows,1)
+  #pragma omp parallel for schedule(static,4) \
+    magick_threads(image,image,1,1)
 #endif
   for (y=0; y < (ssize_t) rows; y++)
   {
@@ -1320,8 +1291,8 @@ static void Hull(const Image *image,const ssize_t x_offset,
   r=q+(y_offset*(columns+2)+x_offset);
   s=q-(y_offset*(columns+2)+x_offset);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static) \
-    magick_threads(image,image,rows,1)
+  #pragma omp parallel for schedule(static,4) \
+    magick_threads(image,image,1,1)
 #endif
   for (y=0; y < (ssize_t) rows; y++)
   {
@@ -1425,13 +1396,6 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
   despeckle_view=AcquireAuthenticCacheView(despeckle_image,exception);
   for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
   {
-    PixelChannel
-       channel;
-
-    PixelTrait
-      despeckle_traits,
-      traits;
-
     register ssize_t
       k,
       x;
@@ -1440,16 +1404,16 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
       j,
       y;
 
-    if (status == MagickFalse)
-      continue;
-    channel=GetPixelChannelChannel(image,i);
-    traits=GetPixelChannelTraits(image,channel);
-    despeckle_traits=GetPixelChannelTraits(despeckle_image,channel);
+    PixelChannel channel=GetPixelChannelChannel(image,i);
+    PixelTrait traits=GetPixelChannelTraits(image,channel);
+    PixelTrait despeckle_traits=GetPixelChannelTraits(despeckle_image,channel);
     if ((traits == UndefinedPixelTrait) ||
         (despeckle_traits == UndefinedPixelTrait))
       continue;
     if ((despeckle_traits & CopyPixelTrait) != 0)
       continue;
+    if (status == MagickFalse)
+      continue;
     (void) ResetMagickMemory(pixels,0,length*sizeof(*pixels));
     j=(ssize_t) image->columns+2;
     for (y=0; y < (ssize_t) image->rows; y++)
@@ -1488,8 +1452,8 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
       register Quantum
         *restrict q;
 
-      q=QueueCacheViewAuthenticPixels(despeckle_view,0,y,
-        despeckle_image->columns,1,exception);
+      q=GetCacheViewAuthenticPixels(despeckle_view,0,y,despeckle_image->columns,
+        1,exception);
       if (q == (Quantum *) NULL)
         {
           status=MagickFalse;
@@ -1590,6 +1554,8 @@ MagickExport Image *EdgeImage(const Image *image,const double radius,
     ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
   kernel_info->width=width;
   kernel_info->height=width;
+  kernel_info->x=(ssize_t) width/2;
+  kernel_info->y=(ssize_t) width/2;
   kernel_info->values=(MagickRealType *) MagickAssumeAligned(
     AcquireAlignedMemory(kernel_info->width,kernel_info->width*
     sizeof(*kernel_info->values)));
@@ -1680,6 +1646,8 @@ MagickExport Image *EmbossImage(const Image *image,const double radius,
     ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
   kernel_info->width=width;
   kernel_info->height=width;
+  kernel_info->x=(ssize_t) width/2;
+  kernel_info->y=(ssize_t) width/2;
   kernel_info->values=(MagickRealType *) MagickAssumeAligned(
     AcquireAlignedMemory(kernel_info->width,kernel_info->width*
     sizeof(*kernel_info->values)));
@@ -1777,6 +1745,8 @@ MagickExport Image *GaussianBlurImage(const Image *image,const double radius,
   (void) ResetMagickMemory(kernel_info,0,sizeof(*kernel_info));
   kernel_info->width=width;
   kernel_info->height=width;
+  kernel_info->x=(ssize_t) width/2;
+  kernel_info->y=(ssize_t) width/2;
   kernel_info->signature=MagickSignature;
   kernel_info->values=(MagickRealType *) MagickAssumeAligned(
     AcquireAlignedMemory(kernel_info->width,kernel_info->width*
@@ -1987,13 +1957,6 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius,
           gamma,
           pixel;
 
-        PixelChannel
-          channel;
-
-        PixelTrait
-          blur_traits,
-          traits;
-
         register const Quantum
           *restrict r;
 
@@ -2003,9 +1966,9 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius,
         register ssize_t
           j;
 
-        channel=GetPixelChannelChannel(image,i);
-        traits=GetPixelChannelTraits(image,channel);
-        blur_traits=GetPixelChannelTraits(blur_image,channel);
+        PixelChannel channel=GetPixelChannelChannel(image,i);
+        PixelTrait traits=GetPixelChannelTraits(image,channel);
+        PixelTrait blur_traits=GetPixelChannelTraits(blur_image,channel);
         if ((traits == UndefinedPixelTrait) ||
             (blur_traits == UndefinedPixelTrait))
           continue;
@@ -2214,8 +2177,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
       {
         degrees+=5.0;
         preview_image=ShearImage(thumbnail,degrees,degrees,exception);
-        (void) FormatLocaleString(label,MaxTextExtent,"shear %gx%g",
-          degrees,2.0*degrees);
+        (void) FormatLocaleString(label,MaxTextExtent,"shear %gx%g",degrees,
+          2.0*degrees);
         break;
       }
       case RollPreview:
@@ -2232,8 +2195,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
         preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
         if (preview_image == (Image *) NULL)
           break;
-        (void) FormatLocaleString(factor,MaxTextExtent,"100,100,%g",
-          2.0*percentage);
+        (void) FormatLocaleString(factor,MaxTextExtent,"100,100,%g",2.0*
+          percentage);
         (void) ModulateImage(preview_image,factor,exception);
         (void) FormatLocaleString(label,MaxTextExtent,"modulate %s",factor);
         break;
@@ -2243,8 +2206,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
         preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
         if (preview_image == (Image *) NULL)
           break;
-        (void) FormatLocaleString(factor,MaxTextExtent,"100,%g",
-          2.0*percentage);
+        (void) FormatLocaleString(factor,MaxTextExtent,"100,%g",2.0*percentage);
         (void) ModulateImage(preview_image,factor,exception);
         (void) FormatLocaleString(label,MaxTextExtent,"modulate %s",factor);
         break;
@@ -2388,8 +2350,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
       case SharpenPreview:
       {
         preview_image=SharpenImage(thumbnail,radius,sigma,exception);
-        (void) FormatLocaleString(label,MaxTextExtent,"sharpen %gx%g",
-          radius,sigma);
+        (void) FormatLocaleString(label,MaxTextExtent,"sharpen %gx%g",radius,
+          sigma);
         break;
       }
       case BlurPreview:
@@ -2406,8 +2368,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
           break;
         (void) BilevelImage(thumbnail,(double) (percentage*((double)
           QuantumRange+1.0))/100.0,exception);
-        (void) FormatLocaleString(label,MaxTextExtent,"threshold %g",
-          (double) (percentage*((double) QuantumRange+1.0))/100.0);
+        (void) FormatLocaleString(label,MaxTextExtent,"threshold %g",(double)
+          (percentage*((double) QuantumRange+1.0))/100.0);
         break;
       }
       case EdgeDetectPreview:
@@ -2420,8 +2382,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
       {
         preview_image=SpreadImage(thumbnail,radius,thumbnail->interpolate,
           exception);
-        (void) FormatLocaleString(label,MaxTextExtent,"spread %g",
-          radius+0.5);
+        (void) FormatLocaleString(label,MaxTextExtent,"spread %g",radius+0.5);
         break;
       }
       case SolarizePreview:
@@ -2429,8 +2390,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
         preview_image=CloneImage(thumbnail,0,0,MagickTrue,exception);
         if (preview_image == (Image *) NULL)
           break;
-        (void) SolarizeImage(preview_image,(double) QuantumRange*
-          percentage/100.0,exception);
+        (void) SolarizeImage(preview_image,(double) QuantumRange*percentage/
+          100.0,exception);
         (void) FormatLocaleString(label,MaxTextExtent,"solarize %g",
           (QuantumRange*percentage)/100.0);
         break;
@@ -2440,8 +2401,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
         degrees+=10.0;
         preview_image=ShadeImage(thumbnail,MagickTrue,degrees,degrees,
           exception);
-        (void) FormatLocaleString(label,MaxTextExtent,"shade %gx%g",
-          degrees,degrees);
+        (void) FormatLocaleString(label,MaxTextExtent,"shade %gx%g",degrees,
+          degrees);
         break;
       }
       case RaisePreview:
@@ -2492,24 +2453,24 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
         degrees+=5.0f;
         preview_image=WaveImage(thumbnail,0.5*degrees,2.0*degrees,
           image->interpolate,exception);
-        (void) FormatLocaleString(label,MaxTextExtent,"wave %gx%g",
-          0.5*degrees,2.0*degrees);
+        (void) FormatLocaleString(label,MaxTextExtent,"wave %gx%g",0.5*degrees,
+          2.0*degrees);
         break;
       }
       case OilPaintPreview:
       {
         preview_image=OilPaintImage(thumbnail,(double) radius,(double) sigma,
           exception);
-        (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",
-          radius,sigma);
+        (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",radius,
+          sigma);
         break;
       }
       case CharcoalDrawingPreview:
       {
         preview_image=CharcoalImage(thumbnail,(double) radius,(double) sigma,
           exception);
-        (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",
-          radius,sigma);
+        (void) FormatLocaleString(label,MaxTextExtent,"charcoal %gx%g",radius,
+          sigma);
         break;
       }
       case JPEGPreview:
@@ -2785,22 +2746,15 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle,
           gamma,
           pixel;
 
-        PixelChannel
-          channel;
-
-        PixelTrait
-          blur_traits,
-          traits;
-
         register const Quantum
           *restrict r;
 
         register ssize_t
           j;
 
-        channel=GetPixelChannelChannel(image,i);
-        traits=GetPixelChannelTraits(image,channel);
-        blur_traits=GetPixelChannelTraits(blur_image,channel);
+        PixelChannel channel=GetPixelChannelChannel(image,i);
+        PixelTrait traits=GetPixelChannelTraits(image,channel);
+        PixelTrait blur_traits=GetPixelChannelTraits(blur_image,channel);
         if ((traits == UndefinedPixelTrait) ||
             (blur_traits == UndefinedPixelTrait))
           continue;
@@ -3087,13 +3041,6 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius,
           gamma,
           pixel;
 
-        PixelChannel
-          channel;
-
-        PixelTrait
-          blur_traits,
-          traits;
-
         register const MagickRealType
           *restrict k;
 
@@ -3107,9 +3054,9 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius,
         ssize_t
           v;
 
-        channel=GetPixelChannelChannel(image,i);
-        traits=GetPixelChannelTraits(image,channel);
-        blur_traits=GetPixelChannelTraits(blur_image,channel);
+        PixelChannel channel=GetPixelChannelChannel(image,i);
+        PixelTrait traits=GetPixelChannelTraits(image,channel);
+        PixelTrait blur_traits=GetPixelChannelTraits(blur_image,channel);
         if ((traits == UndefinedPixelTrait) ||
             (blur_traits == UndefinedPixelTrait))
           continue;
@@ -3161,8 +3108,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius,
             contrast=GetPixelIntensity(image,pixels)-intensity;
             if (fabs(contrast) < threshold)
               {
-                alpha=(double) (QuantumScale*
-                  GetPixelAlpha(image,pixels));
+                alpha=(double) (QuantumScale*GetPixelAlpha(image,pixels));
                 pixel+=(*k)*alpha*pixels[i];
                 gamma+=(*k)*alpha;
               }
@@ -3394,16 +3340,9 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray,
         }
       for (i=0; i < (ssize_t) GetPixelChannels(linear_image); i++)
       {
-        PixelChannel
-          channel;
-
-        PixelTrait
-          shade_traits,
-          traits;
-
-        channel=GetPixelChannelChannel(linear_image,i);
-        traits=GetPixelChannelTraits(linear_image,channel);
-        shade_traits=GetPixelChannelTraits(shade_image,channel);
+        PixelChannel channel=GetPixelChannelChannel(linear_image,i);
+        PixelTrait traits=GetPixelChannelTraits(linear_image,channel);
+        PixelTrait shade_traits=GetPixelChannelTraits(shade_image,channel);
         if ((traits == UndefinedPixelTrait) ||
             (shade_traits == UndefinedPixelTrait))
           continue;
@@ -3525,6 +3464,8 @@ MagickExport Image *SharpenImage(const Image *image,const double radius,
   (void) ResetMagickMemory(kernel_info,0,sizeof(*kernel_info));
   kernel_info->width=width;
   kernel_info->height=width;
+  kernel_info->x=(ssize_t) width/2;
+  kernel_info->y=(ssize_t) width/2;
   kernel_info->signature=MagickSignature;
   kernel_info->values=(MagickRealType *) MagickAssumeAligned(
     AcquireAlignedMemory(kernel_info->width,kernel_info->width*
@@ -3820,16 +3761,9 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius,
         double
           pixel;
 
-        PixelChannel
-          channel;
-
-        PixelTrait
-          traits,
-          unsharp_traits;
-
-        channel=GetPixelChannelChannel(image,i);
-        traits=GetPixelChannelTraits(image,channel);
-        unsharp_traits=GetPixelChannelTraits(unsharp_image,channel);
+        PixelChannel channel=GetPixelChannelChannel(image,i);
+        PixelTrait traits=GetPixelChannelTraits(image,channel);
+        PixelTrait unsharp_traits=GetPixelChannelTraits(unsharp_image,channel);
         if ((traits == UndefinedPixelTrait) ||
             (unsharp_traits == UndefinedPixelTrait))
           continue;