]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/145
authorCristy <urban-warrior@imagemagick.org>
Sat, 12 Mar 2016 14:06:16 +0000 (09:06 -0500)
committerCristy <urban-warrior@imagemagick.org>
Sat, 12 Mar 2016 14:06:16 +0000 (09:06 -0500)
MagickCore/distort.c
MagickCore/resize.c

index 033e26d1f934d331d0e9b3d137efe4733c1153f8..4f8102234298184c62970e4ab2487952f71374fe 100644 (file)
@@ -1443,7 +1443,7 @@ static double *GenerateCoefficients(const Image *image,
 %
 %  The format of the DistortResizeImage method is:
 %
-%      Image *AdaptiveResizeImage(const Image *image,const size_t columns,
+%      Image *DistortResizeImage(const Image *image,const size_t columns,
 %        const size_t rows,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
@@ -1515,7 +1515,8 @@ MagickExport Image *DistortResizeImage(const Image *image,
       if ( resize_image == (Image *) NULL )
         return((Image *) NULL);
 
-      (void) SetImageAlphaChannel(resize_image,DeactivateAlphaChannel,exception);
+      (void) SetImageAlphaChannel(resize_image,DeactivateAlphaChannel,
+        exception);
     }
   else
     {
@@ -1551,10 +1552,8 @@ MagickExport Image *DistortResizeImage(const Image *image,
           return((Image *) NULL);
         }
       /* replace resize images alpha with the separally distorted alpha */
-      (void) SetImageAlphaChannel(resize_image,DeactivateAlphaChannel,
-        exception);
-      (void) SetImageAlphaChannel(resize_alpha,DeactivateAlphaChannel,
-        exception);
+      (void) SetImageAlphaChannel(resize_image,OffAlphaChannel,exception);
+      (void) SetImageAlphaChannel(resize_alpha,OffAlphaChannel,exception);
       (void) CompositeImage(resize_image,resize_alpha,CopyAlphaCompositeOp,
         MagickTrue,0,0,exception);
       resize_alpha=DestroyImage(resize_alpha);
index 10cbbfc0d34baeb7f1c7d2c5e8a54d929e6a2e78..d10a4835dddaa0628e3d8b64ad276a662a57b971 100644 (file)
@@ -2852,27 +2852,28 @@ MagickExport Image *ResizeImage(const Image *image,const size_t columns,
           ((x_factor*y_factor) > 1.0))
         filter_type=MitchellFilter;
   resize_filter=AcquireResizeFilter(image,filter_type,MagickFalse,exception);
-  resize_image=AccelerateResizeImage(image,columns,rows,resize_filter,exception);
+  resize_image=AccelerateResizeImage(image,columns,rows,resize_filter,
+    exception);
   if (resize_image != (Image *) NULL)
-  {
-    resize_filter=DestroyResizeFilter(resize_filter);
-    return(resize_image);
-  }
+    {
+      resize_filter=DestroyResizeFilter(resize_filter);
+      return(resize_image);
+    }
   resize_image=CloneImage(image,columns,rows,MagickTrue,exception);
   if (resize_image == (Image *) NULL)
-  {
-    resize_filter=DestroyResizeFilter(resize_filter);
-    return(resize_image);
-  }
+    {
+      resize_filter=DestroyResizeFilter(resize_filter);
+      return(resize_image);
+    }
   if (x_factor > y_factor)
     filter_image=CloneImage(image,columns,image->rows,MagickTrue,exception);
   else
     filter_image=CloneImage(image,image->columns,rows,MagickTrue,exception);
   if (filter_image == (Image *) NULL)
-  {
-    resize_filter=DestroyResizeFilter(resize_filter);
-    return(DestroyImage(resize_image));
-  }
+    {
+      resize_filter=DestroyResizeFilter(resize_filter);
+      return(DestroyImage(resize_image));
+    }
   /*
     Resize image.
   */