From 8306a8d2a4724da6e922153284f5910e4149b421 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 12 Mar 2016 09:06:16 -0500
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/145

---
 MagickCore/distort.c | 11 +++++------
 MagickCore/resize.c  | 27 ++++++++++++++-------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 033e26d1f..4f8102234 100644
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -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);
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 10cbbfc0d..d10a4835d 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -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.
   */
-- 
2.40.0