diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index 1ab02c2..93f718d 100644
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -295,7 +295,7 @@
" break;\n"
" }\n"
" }\n"
- " gamma=1.0/(fabs(gamma) < MagickEpsilon ? MagickEpsilon : gamma);\n"
+ " gamma=ClampReciprocal(gamma);\n"
" const unsigned long index = y*columns+x;\n"
" output[index].x=ClampToQuantum(gamma*sum.x);\n"
" output[index].y=ClampToQuantum(gamma*sum.y);\n"
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 83906a2..36a8779 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -58,6 +58,7 @@
#include "MagickCore/monitor.h"
#include "MagickCore/monitor-private.h"
#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/pixel-private.h"
#include "MagickCore/quantize.h"
#include "MagickCore/quantum.h"
#include "MagickCore/quantum-private.h"
@@ -641,8 +642,7 @@
gamma=DisplayGamma;
value=GetImageProperty(image,"gamma",exception);
if (value != (const char *) NULL)
- gamma=1.0/(fabs(StringToDouble(value,(char **) NULL)) < MagickEpsilon ?
- MagickEpsilon : StringToDouble(value,(char **) NULL));
+ gamma=ClampReciprocal(StringToDouble(value,(char **) NULL));
film_gamma=FilmGamma;
value=GetImageProperty(image,"film-gamma",exception);
if (value != (const char *) NULL)
@@ -2150,8 +2150,7 @@
gamma=DisplayGamma;
value=GetImageProperty(image,"gamma",exception);
if (value != (const char *) NULL)
- gamma=1.0/(fabs(StringToDouble(value,(char **) NULL)) < MagickEpsilon ?
- MagickEpsilon : StringToDouble(value,(char **) NULL));
+ gamma=ClampReciprocal(StringToDouble(value,(char **) NULL));
film_gamma=FilmGamma;
value=GetImageProperty(image,"film-gamma",exception);
if (value != (const char *) NULL)
diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 7653f7c..d57c138 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -950,7 +950,7 @@
channel=GetPixelChannelMapChannel(image,i);
gamma=image_statistics[i].standard_deviation*
reconstruct_statistics[channel].standard_deviation;
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
distortion[i]=QuantumRange*gamma*distortion[i];
distortion[CompositePixelChannel]+=distortion[i]*distortion[i];
}
diff --git a/MagickCore/composite-private.h b/MagickCore/composite-private.h
index 9ba1063..5d2f16d 100644
--- a/MagickCore/composite-private.h
+++ b/MagickCore/composite-private.h
@@ -30,6 +30,7 @@
#include "MagickCore/image.h"
#include "MagickCore/image-private.h"
#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/pixel-private.h"
static inline MagickRealType MagickOver_(const MagickRealType p,
const MagickRealType alpha,const MagickRealType q,const MagickRealType beta)
@@ -61,7 +62,7 @@
Sa=QuantumScale*alpha;
Da=QuantumScale*beta,
gamma=Sa*(-Da)+Sa+Da;
- gamma=1.0/(gamma < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
PixelChannel
@@ -132,7 +133,7 @@
Da=QuantumScale*beta,
gamma=Sa*(-Da)+Sa+Da;
composite->alpha=(MagickRealType) QuantumRange*gamma;
- gamma=1.0/(fabs(gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
composite->red=gamma*MagickOver_(p->red,alpha,q->red,beta);
composite->green=gamma*MagickOver_(p->green,alpha,q->green,beta);
composite->blue=gamma*MagickOver_(p->blue,alpha,q->blue,beta);
@@ -161,7 +162,7 @@
Da=QuantumScale*beta;
gamma=RoundToUnity(Sa+Da); /* 'Plus' blending -- not 'Over' blending */
composite->alpha=(MagickRealType) QuantumRange*gamma;
- gamma=1.0/(fabs(gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
composite->red=gamma*(Sa*p->red+Da*q->red);
composite->green=gamma*(Sa*p->green+Da*q->green);
composite->blue=gamma*(Sa*p->blue+Da*q->blue);
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index b64d1fe..7bf2f98 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -502,7 +502,7 @@
*/
Sc=(MagickRealType) GetPixelChannel(composite_image,channel,p);
Dc=(MagickRealType) q[i];
- gamma=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha);
+ gamma=ClampReciprocal(alpha);
q[i]=ClampToQuantum(gamma*(Sa*Sc-Sa*Da*Dc+Da*Dc));
}
p+=GetPixelChannels(composite_image);
@@ -1649,7 +1649,7 @@
default:
break;
}
- gamma=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha);
+ gamma=ClampReciprocal(alpha);
pixel=Dc;
switch (compose)
{
diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index a26f227..38aba06 100644
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1798,28 +1798,28 @@
s.x = (double) image->page.x;
s.y = (double) image->page.y;
scale=inverse[6]*s.x+inverse[7]*s.y+1.0;
- scale=1.0/(fabs(scale) < MagickEpsilon ? MagickEpsilon : scale);
+ scale=ClampReciprocal(scale);
d.x = scale*(inverse[0]*s.x+inverse[1]*s.y+inverse[2]);
d.y = scale*(inverse[3]*s.x+inverse[4]*s.y+inverse[5]);
InitalBounds(d);
s.x = (double) image->page.x+image->columns;
s.y = (double) image->page.y;
scale=inverse[6]*s.x+inverse[7]*s.y+1.0;
- scale=1.0/(fabs(scale) < MagickEpsilon ? MagickEpsilon : scale);
+ scale=ClampReciprocal(scale);
d.x = scale*(inverse[0]*s.x+inverse[1]*s.y+inverse[2]);
d.y = scale*(inverse[3]*s.x+inverse[4]*s.y+inverse[5]);
ExpandBounds(d);
s.x = (double) image->page.x;
s.y = (double) image->page.y+image->rows;
scale=inverse[6]*s.x+inverse[7]*s.y+1.0;
- scale=1.0/(fabs(scale) < MagickEpsilon ? MagickEpsilon : scale);
+ scale=ClampReciprocal(scale);
d.x = scale*(inverse[0]*s.x+inverse[1]*s.y+inverse[2]);
d.y = scale*(inverse[3]*s.x+inverse[4]*s.y+inverse[5]);
ExpandBounds(d);
s.x = (double) image->page.x+image->columns;
s.y = (double) image->page.y+image->rows;
scale=inverse[6]*s.x+inverse[7]*s.y+1.0;
- scale=1.0/(fabs(scale) < MagickEpsilon ? MagickEpsilon : scale);
+ scale=ClampReciprocal(scale);
d.x = scale*(inverse[0]*s.x+inverse[1]*s.y+inverse[2]);
d.y = scale*(inverse[3]*s.x+inverse[4]*s.y+inverse[5]);
ExpandBounds(d);
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 061e9e8..9658e85 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -3180,7 +3180,7 @@
q.y=(double) y-gradient_vector->y1;
length=sqrt(q.x*q.x+q.y*q.y);
gamma=sqrt(p.x*p.x+p.y*p.y)*length;
- gamma=1.0/(gamma < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
scale=p.x*q.x+p.y*q.y;
offset=gamma*scale*length;
return(offset);
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index c67c47f..623c38e 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -69,6 +69,7 @@
#include "MagickCore/morphology.h"
#include "MagickCore/paint.h"
#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/pixel-private.h"
#include "MagickCore/property.h"
#include "MagickCore/quantize.h"
#include "MagickCore/quantum.h"
@@ -407,7 +408,7 @@
pixels+=GetPixelChannels(image);
}
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
continue;
}
@@ -425,7 +426,7 @@
pixels+=GetPixelChannels(image);
}
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
q+=GetPixelChannels(blur_image);
@@ -734,7 +735,7 @@
pixels+=GetPixelChannels(image);
}
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(sharp_image,channel,ClampToQuantum(gamma*pixel),q);
continue;
}
@@ -752,7 +753,7 @@
pixels+=GetPixelChannels(image);
}
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(sharp_image,channel,ClampToQuantum(gamma*pixel),q);
}
q+=GetPixelChannels(sharp_image);
@@ -1050,7 +1051,7 @@
k++;
pixels+=GetPixelChannels(image);
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
p+=GetPixelChannels(image);
@@ -1180,7 +1181,7 @@
k++;
pixels+=GetPixelChannels(blur_image);
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
p+=GetPixelChannels(blur_image);
@@ -2059,7 +2060,7 @@
gamma+=(*k)*alpha;
k++;
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
p+=GetPixelChannels(image);
@@ -2842,7 +2843,7 @@
pixel+=r[i];
gamma++;
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
continue;
}
@@ -2860,7 +2861,7 @@
pixel+=GetPixelAlpha(image,r)*r[i];
gamma+=GetPixelAlpha(image,r);
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
p+=GetPixelChannels(image);
@@ -3138,7 +3139,7 @@
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
continue;
}
@@ -3164,7 +3165,7 @@
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q);
}
p+=GetPixelChannels(image);
diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index 2266ac2..f814b80 100644
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -572,7 +572,7 @@
break;
}
}
- normalize=1.0/(fabs((double) normalize) < MagickEpsilon ? MagickEpsilon : normalize);
+ normalize=ClampReciprocal(normalize);
for (y=0; y < (ssize_t) number_grays; y++)
{
register ssize_t
diff --git a/MagickCore/image.c b/MagickCore/image.c
index c6cbdd7..0f88576 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2087,7 +2087,7 @@
Sa=QuantumScale*alpha;
Da=QuantumScale*beta,
gamma=Sa*(-Da)+Sa+Da;
- gamma=1.0/(gamma < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
PixelChannel
diff --git a/MagickCore/pixel-private.h b/MagickCore/pixel-private.h
index 58dc511..75b2091 100644
--- a/MagickCore/pixel-private.h
+++ b/MagickCore/pixel-private.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-static inline MagickRealType AlphaReciprocal(const MagickRealType alpha)
+static inline MagickRealType ClampReciprocal(const MagickRealType alpha)
{
MagickRealType
beta;
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 8048261..e4935bc 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4136,7 +4136,7 @@
}
for (i=0; i < 16; i++)
{
- gamma=1.0/(fabs((double) alpha[i]) < MagickEpsilon ? MagickEpsilon : alpha[i]);
+ gamma=ClampReciprocal(alpha[i]);
*pixel+=gamma*0.0625*pixels[i];
}
break;
@@ -4199,7 +4199,7 @@
*/
gamma=1.0;
if (channel != AlphaPixelChannel)
- gamma=AlphaReciprocal(cy[0]*(cx[0]*alpha[0]+cx[1]*alpha[1]+cx[2]*
+ gamma=ClampReciprocal(cy[0]*(cx[0]*alpha[0]+cx[1]*alpha[1]+cx[2]*
alpha[2]+cx[3]*alpha[3])+cy[1]*(cx[0]*alpha[4]+cx[1]*alpha[5]+
cx[2]*alpha[6]+cx[3]*alpha[7])+cy[2]*(cx[0]*alpha[8]+
cx[1]*alpha[9]+cx[2]*alpha[10]+cx[3]*alpha[11])+cy[3]*(
@@ -4243,7 +4243,7 @@
epsilon.y=1.0-delta.y;
gamma=((epsilon.y*(epsilon.x*alpha[0]+delta.x*alpha[1])+delta.y*
(epsilon.x*alpha[2]+delta.x*alpha[3])));
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
*pixel=gamma*(epsilon.y*(epsilon.x*pixels[0]+delta.x*pixels[1])+delta.y*
(epsilon.x*pixels[2]+delta.x*pixels[3]));
break;
@@ -4350,7 +4350,7 @@
*/
delta.y=1.0-delta.y;
gamma=MeshInterpolate(&delta,alpha[2],alpha[3],alpha[0]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
*pixel=gamma*MeshInterpolate(&delta,pixels[2],pixels[3],
pixels[0]);
}
@@ -4361,7 +4361,7 @@
*/
delta.x=1.0-delta.x;
gamma=MeshInterpolate(&delta,alpha[1],alpha[0],alpha[3]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
*pixel=gamma*MeshInterpolate(&delta,pixels[1],pixels[0],
pixels[3]);
}
@@ -4377,7 +4377,7 @@
Top-left triangle (pixel: 0, diagonal: 1-2).
*/
gamma=MeshInterpolate(&delta,alpha[0],alpha[1],alpha[2]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
*pixel=gamma*MeshInterpolate(&delta,pixels[0],pixels[1],
pixels[2]);
}
@@ -4389,7 +4389,7 @@
delta.x=1.0-delta.x;
delta.y=1.0-delta.y;
gamma=MeshInterpolate(&delta,alpha[3],alpha[2],alpha[1]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
*pixel=gamma*MeshInterpolate(&delta,pixels[3],pixels[2],
pixels[1]);
}
@@ -4438,7 +4438,7 @@
for (j=(-1); j < 3L; j++)
{
dx=CubicWeightingFunction(delta.x-(MagickRealType) j);
- gamma=1.0/(fabs((double) alpha[n]) < MagickEpsilon ? MagickEpsilon : alpha[n]);
+ gamma=ClampReciprocal(alpha[n]);
*pixel+=gamma*dx*dy*pixels[n];
n++;
}
@@ -4565,7 +4565,7 @@
alpha[j]=QuantumScale*GetPixelAlpha(source,p+j*
GetPixelChannels(source));
pixels[j]*=alpha[j];
- gamma=1.0/(fabs((double) alpha[j]) < MagickEpsilon ? MagickEpsilon : alpha[j]);
+ gamma=ClampReciprocal(alpha[j]);
sum+=gamma*0.0625*pixels[j];
}
SetPixelChannel(destination,channel,ClampToQuantum(sum),pixel);
@@ -4641,7 +4641,7 @@
*/
gamma=1.0;
if ((traits & BlendPixelTrait) == 0)
- gamma=AlphaReciprocal(cy[0]*(cx[0]*alpha[0]+cx[1]*alpha[1]+cx[2]*
+ gamma=ClampReciprocal(cy[0]*(cx[0]*alpha[0]+cx[1]*alpha[1]+cx[2]*
alpha[2]+cx[3]*alpha[3])+cy[1]*(cx[0]*alpha[4]+cx[1]*alpha[5]+
cx[2]*alpha[6]+cx[3]*alpha[7])+cy[2]*(cx[0]*alpha[8]+
cx[1]*alpha[9]+cx[2]*alpha[10]+cx[3]*alpha[11])+cy[3]*(
@@ -4687,7 +4687,7 @@
if ((traits & BlendPixelTrait) == 0)
{
gamma=((epsilon.y*(epsilon.x+delta.x)+delta.y*(epsilon.x+delta.x)));
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(destination,channel,ClampToQuantum(gamma*(epsilon.y*
(epsilon.x*pixels[0]+delta.x*pixels[1])+delta.y*(epsilon.x*
pixels[2]+delta.x*pixels[3]))),pixel);
@@ -4705,7 +4705,7 @@
pixels[3]*=alpha[3];
gamma=((epsilon.y*(epsilon.x*alpha[0]+delta.x*alpha[1])+delta.y*
(epsilon.x*alpha[2]+delta.x*alpha[3])));
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(destination,channel,ClampToQuantum(gamma*(epsilon.y*
(epsilon.x*pixels[0]+delta.x*pixels[1])+delta.y*(epsilon.x*pixels[2]+
delta.x*pixels[3]))),pixel);
@@ -4859,7 +4859,7 @@
*/
delta.y=1.0-delta.y;
gamma=MeshInterpolate(&delta,alpha[2],alpha[3],alpha[0]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(destination,channel,ClampToQuantum(gamma*
MeshInterpolate(&delta,pixels[2],pixels[3],pixels[0])),pixel);
}
@@ -4870,7 +4870,7 @@
*/
delta.x=1.0-delta.x;
gamma=MeshInterpolate(&delta,alpha[1],alpha[0],alpha[3]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(destination,channel,ClampToQuantum(gamma*
MeshInterpolate(&delta,pixels[1],pixels[0],pixels[3])),pixel);
}
@@ -4886,7 +4886,7 @@
Top-left triangle (pixel: 0, diagonal: 1-2).
*/
gamma=MeshInterpolate(&delta,alpha[0],alpha[1],alpha[2]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(destination,channel,ClampToQuantum(gamma*
MeshInterpolate(&delta,pixels[0],pixels[1],pixels[2])),pixel);
}
@@ -4898,7 +4898,7 @@
delta.x=1.0-delta.x;
delta.y=1.0-delta.y;
gamma=MeshInterpolate(&delta,alpha[3],alpha[2],alpha[1]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(destination,channel,ClampToQuantum(gamma*
MeshInterpolate(&delta,pixels[3],pixels[2],pixels[1])),pixel);
}
@@ -4963,8 +4963,7 @@
for (k=(-1); k < 3L; k++)
{
dx=CubicWeightingFunction(delta.x-(MagickRealType) k);
- gamma=1.0/(fabs((double) alpha[n]) < MagickEpsilon ? MagickEpsilon :
- alpha[n]);
+ gamma=ClampReciprocal(alpha[n]);
sum+=gamma*dx*dy*pixels[n];
n++;
}
@@ -5110,7 +5109,7 @@
pixel->alpha=0.0;
for (i=0; i < 16L; i++)
{
- gamma=1.0/(fabs((double) alpha[i]) < MagickEpsilon ? MagickEpsilon : alpha[i]);
+ gamma=ClampReciprocal(alpha[i]);
pixel->red+=gamma*0.0625*pixels[i].red;
pixel->green+=gamma*0.0625*pixels[i].green;
pixel->blue+=gamma*0.0625*pixels[i].blue;
@@ -5252,7 +5251,7 @@
epsilon.y=1.0-delta.y;
gamma=((epsilon.y*(epsilon.x*alpha[0]+delta.x*alpha[1])+delta.y*
(epsilon.x*alpha[2]+delta.x*alpha[3])));
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
pixel->red=gamma*(epsilon.y*(epsilon.x*pixels[0].red+delta.x*
pixels[1].red)+delta.y*(epsilon.x*pixels[2].red+delta.x*pixels[3].red));
pixel->green=gamma*(epsilon.y*(epsilon.x*pixels[0].green+delta.x*
@@ -5266,7 +5265,7 @@
pixels[1].black)+delta.y*(epsilon.x*pixels[2].black+delta.x*
pixels[3].black));
gamma=((epsilon.y*(epsilon.x+delta.x)+delta.y*(epsilon.x+delta.x)));
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
pixel->alpha=(epsilon.y*(epsilon.x*pixels[0].alpha+delta.x*
pixels[1].alpha)+delta.y*(epsilon.x*pixels[2].alpha+delta.x*
pixels[3].alpha));
@@ -5351,7 +5350,7 @@
*/
delta.y=1.0-delta.y;
gamma=MeshInterpolate(&delta,alpha[2],alpha[3],alpha[0]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
pixel->red=gamma*MeshInterpolate(&delta,pixels[2].red,
pixels[3].red,pixels[0].red);
pixel->green=gamma*MeshInterpolate(&delta,pixels[2].green,
@@ -5372,7 +5371,7 @@
*/
delta.x=1.0-delta.x;
gamma=MeshInterpolate(&delta,alpha[1],alpha[0],alpha[3]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
pixel->red=gamma*MeshInterpolate(&delta,pixels[1].red,
pixels[0].red,pixels[3].red);
pixel->green=gamma*MeshInterpolate(&delta,pixels[1].green,
@@ -5398,7 +5397,7 @@
Top-left triangle (pixel: 0, diagonal: 1-2).
*/
gamma=MeshInterpolate(&delta,alpha[0],alpha[1],alpha[2]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
pixel->red=gamma*MeshInterpolate(&delta,pixels[0].red,
pixels[1].red,pixels[2].red);
pixel->green=gamma*MeshInterpolate(&delta,pixels[0].green,
@@ -5420,7 +5419,7 @@
delta.x=1.0-delta.x;
delta.y=1.0-delta.y;
gamma=MeshInterpolate(&delta,alpha[3],alpha[2],alpha[1]);
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
pixel->red=gamma*MeshInterpolate(&delta,pixels[3].red,
pixels[2].red,pixels[1].red);
pixel->green=gamma*MeshInterpolate(&delta,pixels[3].green,
@@ -5505,7 +5504,7 @@
for (j=(-1); j < 3L; j++)
{
dx=CubicWeightingFunction(delta.x-(MagickRealType) j);
- gamma=1.0/(fabs((double) alpha[n]) < MagickEpsilon ? MagickEpsilon : alpha[n]);
+ gamma=ClampReciprocal(alpha[n]);
pixel->red+=gamma*dx*dy*pixels[n].red;
pixel->green+=gamma*dx*dy*pixels[n].green;
pixel->blue+=gamma*dx*dy*pixels[n].blue;
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index 2f7a307..cfc6876 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -194,6 +194,7 @@
#include "MagickCore/monitor-private.h"
#include "MagickCore/option.h"
#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/pixel-private.h"
#include "MagickCore/quantize.h"
#include "MagickCore/quantum.h"
#include "MagickCore/quantum-private.h"
@@ -1251,7 +1252,7 @@
*/
q=image->colormap+image->colors;
alpha=(MagickRealType) ((MagickOffsetType) node_info->number_unique);
- alpha=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha);
+ alpha=ClampReciprocal(alpha);
if (cube_info->associate_alpha == MagickFalse)
{
q->red=(double) ClampToQuantum((MagickRealType)
@@ -1285,7 +1286,7 @@
gamma;
gamma=(MagickRealType) (QuantumScale*q->alpha);
- gamma=1.0/(fabs(gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
q->red=(double) ClampToQuantum((MagickRealType)
(alpha*gamma*QuantumRange*node_info->total_color.red));
q->green=(double) ClampToQuantum((MagickRealType)
diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c
index c468b89..628c3bc 100644
--- a/MagickCore/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -62,6 +62,7 @@
#include "MagickCore/option.h"
#include "MagickCore/pixel.h"
#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/pixel-private.h"
#include "MagickCore/quantum.h"
#include "MagickCore/quantum-private.h"
#include "MagickCore/resource_.h"
@@ -3609,7 +3610,7 @@
continue;
}
Sa=QuantumScale*GetPixelAlpha(image,q);
- gamma=1.0/(fabs(Sa) < MagickEpsilon ? MagickEpsilon : Sa);
+ gamma=ClampReciprocal(Sa);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
PixelChannel
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index d8cca9e..419d80e 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -61,6 +61,7 @@
#include "MagickCore/monitor-private.h"
#include "MagickCore/option.h"
#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-private.h"
#include "MagickCore/quantum-private.h"
#include "MagickCore/resample.h"
#include "MagickCore/resample-private.h"
@@ -2362,7 +2363,7 @@
pixel+=alpha*p[k*GetPixelChannels(image)+i];
gamma+=alpha;
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(resize_image,channel,ClampToQuantum(gamma*pixel),q);
}
q+=GetPixelChannels(resize_image);
@@ -2578,7 +2579,7 @@
pixel+=alpha*p[k*GetPixelChannels(image)+i];
gamma+=alpha;
}
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
SetPixelChannel(resize_image,channel,ClampToQuantum(gamma*pixel),q);
}
q+=GetPixelChannels(resize_image);
@@ -3209,7 +3210,7 @@
}
alpha=QuantumScale*scanline[x*GetPixelChannels(image)+
GetPixelChannelMapChannel(image,AlphaPixelChannel)];
- gamma=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha);
+ gamma=ClampReciprocal(alpha);
SetPixelChannel(scale_image,channel,ClampToQuantum(gamma*scanline[
x*GetPixelChannels(image)+offset]),q);
}
@@ -3311,7 +3312,7 @@
}
alpha=QuantumScale*scanline[x*GetPixelChannels(image)+
GetPixelChannelMapChannel(image,AlphaPixelChannel)];
- gamma=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha);
+ gamma=ClampReciprocal(alpha);
SetPixelChannel(scale_image,channel,ClampToQuantum(gamma*
scale_scanline[x*MaxPixelChannels+channel]),q);
}
diff --git a/coders/pango.c b/coders/pango.c
index 277d2de..3262b35 100644
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -424,7 +424,7 @@
Disassociate alpha.
*/
gamma=1.0-QuantumScale*fill_color.alpha;
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
fill_color.blue*=gamma;
fill_color.green*=gamma;
fill_color.red*=gamma;
diff --git a/coders/svg.c b/coders/svg.c
index d4aab74..bafc691 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2939,7 +2939,7 @@
gamma;
gamma=1.0-QuantumScale*fill_color.alpha;
- gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma);
+ gamma=ClampReciprocal(gamma);
fill_color.blue*=gamma;
fill_color.green*=gamma;
fill_color.red*=gamma;
