(no commit message)

[imagemagick] / MagickCore / distort.c

diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 037717720801b361f601d2a7e12c7dc8bc33be57..fd81081b0b8efd117130f53fe2f05a4c93e7bf1c 100644 (file)
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1520,9 +1520,6 @@ MagickExport Image *DistortResizeImage(const Image *image,
     }
   else
     {
-      Image
-        *resize_alpha;
-
       /*
         Image has transparency so handle colors and alpha separatly.
         Basically we need to separate Virtual-Pixel alpha in the resized
@@ -1530,6 +1527,9 @@ MagickExport Image *DistortResizeImage(const Image *image,
 
         distort alpha channel separately
       */
+      Image
+        *resize_alpha;
+
       (void) SetImageAlphaChannel(tmp_image,ExtractAlphaChannel,exception);
       (void) SetImageAlphaChannel(tmp_image,OpaqueAlphaChannel,exception);
       resize_alpha=DistortImage(tmp_image,AffineDistortion,12,distort_args,
@@ -2282,7 +2282,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
     }
   if ((IsPixelInfoGray(&distort_image->background_color) == MagickFalse) &&
       (IsGrayColorspace(distort_image->colorspace) != MagickFalse))
-    (void) TransformImageColorspace(distort_image,sRGBColorspace,exception);
+    (void) TransformImageColorspace(distort_image,RGBColorspace,exception);
   if (distort_image->background_color.matte != MagickFalse)
     distort_image->matte=MagickTrue;
   distort_image->page.x=geometry.x;
@@ -2376,7 +2376,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method,
 
       invalid=distort_image->matte_color;
       if (distort_image->colorspace == CMYKColorspace)
-        ConvertsRGBToCMYK(&invalid);   /* what about other color spaces? */
+        ConvertRGBToCMYK(&invalid);   /* what about other color spaces? */
       for (i=0; i < (ssize_t) distort_image->columns; i++)
       {
         /* map pixel coordinate to distortion space coordinate */
@@ -2804,7 +2804,7 @@ MagickExport Image *RotateImage(const Image *image,const double degrees,
     *distort_image,
     *rotate_image;
 
-  MagickRealType
+  double
     angle;
 
   PointInfo