(no commit message)

[imagemagick] / magick / paint.c

diff --git a/magick/paint.c b/magick/paint.c
index a687f2fcfe3aa1b1708ffa932dbe32fe6de61465..6de39fbdd71df523610a1cb4674f0fbb19f4a503 100644 (file)
--- a/magick/paint.c
+++ b/magick/paint.c
@@ -57,10 +57,6 @@
 #include "magick/string_.h"
 #include "magick/thread-private.h"
 \f
-static inline double MagickMax(const double x,const double y)
-{
-    return( x > y ? x : y);
-}
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -376,7 +372,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  GradientImage() applies a continuously smooth color transitions assize_t a
+%  GradientImage() applies a continuously smooth color transitions along a
 %  vector from one color to another.
 %
 %  Note, the interface of this method will change in the future to support
@@ -403,6 +399,12 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
 % This provides a good example of making use of the DrawGradientImage
 % function and the gradient structure in draw_info.
 */
+
+static inline double MagickMax(const double x,const double y)
+{
+  return(x > y ? x : y);
+}
+
 MagickExport MagickBooleanType GradientImage(Image *image,
   const GradientType type,const SpreadMethod method,
   const PixelPacket *start_color,const PixelPacket *stop_color)
@@ -672,7 +674,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
               count=histogram[k];
             }
         }
-        i+=image->columns+width;
+        i+=(ssize_t) (image->columns+width);
       }
       *q=(*(p+j));
       if (image->colorspace == CMYKColorspace)