From de64d1cebf3790ef29d6f4b7c8b890e80edddd08 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 26 Mar 2011 01:35:35 +0000 Subject: [PATCH] --- magick/pixel.c | 9 +++++---- magick/pixel.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/magick/pixel.c b/magick/pixel.c index 2bf40c465..3ed231901 100644 --- a/magick/pixel.c +++ b/magick/pixel.c @@ -3394,7 +3394,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image, % The format of the InterpolatePixelPacket method is: % % MagickBooleanType InterpolatePixelPacket(const Image *image, -% CacheView *image_view,const InterpolatePixelMethod method, +% const CacheView *image_view,const InterpolatePixelMethod method, % const double x,const double y,MagickPixelPacket *pixel, % ExceptionInfo *exception) % @@ -3485,7 +3485,7 @@ static inline double MeshInterpolate(const PointInfo *delta,const double p, return(delta->x*x+delta->y*y+(1.0-delta->x-delta->y)*p); } -static inline ssize_t NearestNeighbor(MagickRealType x) +static inline ssize_t NearestNeighbor(const MagickRealType x) { if (x >= 0.0) return((ssize_t) (x+0.5)); @@ -3493,8 +3493,9 @@ static inline ssize_t NearestNeighbor(MagickRealType x) } MagickExport MagickBooleanType InterpolatePixelPacket(const Image *image, - CacheView *image_view,const InterpolatePixelMethod method,const double x, - const double y,MagickPixelPacket *pixel,ExceptionInfo *exception) + const CacheView *image_view,const InterpolatePixelMethod method, + const double x,const double y,MagickPixelPacket *pixel, + ExceptionInfo *exception) { MagickBooleanType status; diff --git a/magick/pixel.h b/magick/pixel.h index fdf6523bb..861f3f49e 100644 --- a/magick/pixel.h +++ b/magick/pixel.h @@ -154,7 +154,7 @@ extern MagickExport MagickBooleanType const size_t,const char *,const StorageType,void *,ExceptionInfo *), ImportImagePixels(Image *,const ssize_t,const ssize_t,const size_t, const size_t,const char *,const StorageType,const void *), - InterpolatePixelPacket(const Image *,CacheView_ *, + InterpolatePixelPacket(const Image *,const CacheView_ *, const InterpolatePixelMethod,const double,const double,MagickPixelPacket *, ExceptionInfo *); -- 2.50.0