summaryrefslogtreecommitdiff
path: root/MagickWand/pixel-wand.c
diff options
context:
space:
mode:
authorcristy <urban-warrior@git.imagemagick.org>2012-02-11 17:59:50 +0000
committercristy <urban-warrior@git.imagemagick.org>2012-02-11 17:59:50 +0000
commite42f658533644aecb733785ffd91b286d6778dea (patch)
tree64a73b49946b0ce782706fdc899d1598f8d55f5c /MagickWand/pixel-wand.c
parentb381a2618e8bb9e1e76299676711d0ec1063feab (diff)
downloadImageMagick-e42f658533644aecb733785ffd91b286d6778dea.tar.gz
Diffstat (limited to 'MagickWand/pixel-wand.c')
-rw-r--r--MagickWand/pixel-wand.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c
index 8950383e9..c44e3d687 100644
--- a/MagickWand/pixel-wand.c
+++ b/MagickWand/pixel-wand.c
@@ -1067,9 +1067,9 @@ WandExport void PixelGetHSL(const PixelWand *wand,double *hue,
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- ConvertRGBToHSL(ClampToQuantum(wand->pixel.red),ClampToQuantum(
- wand->pixel.green),ClampToQuantum(wand->pixel.blue),hue,saturation,
- lightness);
+ ConvertRGBToHSL((double) ClampToQuantum(wand->pixel.red),(double)
+ ClampToQuantum(wand->pixel.green),(double) ClampToQuantum(wand->pixel.blue),
+ hue,saturation,lightness);
}
/*
@@ -1262,24 +1262,24 @@ WandExport void PixelGetQuantumPacket(const PixelWand *wand,PixelInfo *packet)
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(packet != (PixelInfo *) NULL);
- packet->alpha=ClampToQuantum(wand->pixel.alpha);
+ packet->alpha=(double) ClampToQuantum(wand->pixel.alpha);
if (wand->pixel.colorspace == CMYKColorspace)
{
- packet->red=ClampToQuantum((MagickRealType) QuantumRange-
+ packet->red=(double) ClampToQuantum((MagickRealType) QuantumRange-
(wand->pixel.red*(QuantumRange-wand->pixel.black)+
wand->pixel.black));
- packet->green=ClampToQuantum((MagickRealType) QuantumRange-
+ packet->green=(double) ClampToQuantum((MagickRealType) QuantumRange-
(wand->pixel.green*(QuantumRange-wand->pixel.black)+
wand->pixel.black));
- packet->blue=ClampToQuantum((MagickRealType) QuantumRange-
+ packet->blue=(double) ClampToQuantum((MagickRealType) QuantumRange-
(wand->pixel.blue*(QuantumRange-wand->pixel.black)+
wand->pixel.black));
- packet->black=ClampToQuantum(wand->pixel.black);
+ packet->black=(double) ClampToQuantum(wand->pixel.black);
return;
}
- packet->red=ClampToQuantum(wand->pixel.red);
- packet->green=ClampToQuantum(wand->pixel.green);
- packet->blue=ClampToQuantum(wand->pixel.blue);
+ packet->red=(double) ClampToQuantum(wand->pixel.red);
+ packet->green=(double) ClampToQuantum(wand->pixel.green);
+ packet->blue=(double) ClampToQuantum(wand->pixel.blue);
}
/*
@@ -1490,7 +1490,7 @@ WandExport void PixelSetAlpha(PixelWand *wand,const double alpha)
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- wand->pixel.alpha=ClampToQuantum(QuantumRange*alpha);
+ wand->pixel.alpha=(double) ClampToQuantum(QuantumRange*alpha);
}
/*