From ada285ba46bd3b79ab9321bbd1e617c6551b1e33 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 7 Jul 2012 19:00:46 +0000 Subject: [PATCH] --- MagickCore/quantize.c | 4 ++-- MagickCore/threshold.c | 2 +- MagickCore/xwindow.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index e50e1abd0..f860aa7a6 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -3251,8 +3251,8 @@ static int IntensityCompare(const void *x,const void *y) color_1=(PixelInfo *) x; color_2=(PixelInfo *) y; - intensity=GetPixelInfoIntensity(color_1)-(ssize_t) - GetPixelInfoIntensity(color_2); + intensity=(ssize_t) (GetPixelInfoIntensity(color_1)-(ssize_t) + GetPixelInfoIntensity(color_2)); return((int) intensity); } diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 6ccc6d05d..bb121c734 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -1384,7 +1384,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, threshold=(ssize_t) (QuantumScale*q[i]*(levels[n]*(map->divisor-1)+1)); level=threshold/(map->divisor-1); threshold-=level*(map->divisor-1); - q[i]=ClampToQuantum((level+(threshold >= + q[i]=ClampToQuantum((double) (level+(threshold >= map->levels[(x % map->width)+map->width*(y % map->height)]))* QuantumRange/levels[n]); n++; diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index 3a637679f..d2c015653 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -2236,11 +2236,11 @@ static void XDitherImage(Image *image,XImage *ximage,ExceptionInfo *exception) break; for (x=0; x < (int) image->columns; x++) { - color.red=(double) ClampToQuantum((red_map[i][j][ + color.red=(double) ClampToQuantum((double) (red_map[i][j][ (int) ScaleQuantumToChar(GetPixelRed(image,p))] << 8)); - color.green=(double) ClampToQuantum((green_map[i][j][ + color.green=(double) ClampToQuantum((double) (green_map[i][j][ (int) ScaleQuantumToChar(GetPixelGreen(image,p))] << 8)); - color.blue=(double) ClampToQuantum((blue_map[i][j][ + color.blue=(double) ClampToQuantum((double) (blue_map[i][j][ (int) ScaleQuantumToChar(GetPixelBlue(image,p))] << 8)); pixel=(size_t) (((size_t) color.red & 0xe0) | (((size_t) color.green & 0xe0) >> 3) | -- 2.40.0