From: cristy Date: Sat, 2 Jun 2012 00:59:20 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5509 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b52834318bcfea7da9c8b4ec8eb4682f009234d;p=imagemagick --- diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c index 772e30ea6..1ab02c25d 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -295,7 +295,7 @@ static const char " break;\n" " }\n" " }\n" - " gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);\n" + " gamma=1.0/(fabs(gamma) < MagickEpsilon ? MagickEpsilon : 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 3c39d19f6..83906a2ae 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -641,8 +641,8 @@ static MagickBooleanType sRGBTransformImage(Image *image, gamma=DisplayGamma; value=GetImageProperty(image,"gamma",exception); if (value != (const char *) NULL) - gamma=1.0/fabs(StringToDouble(value,(char **) NULL)) >= MagickEpsilon ? - StringToDouble(value,(char **) NULL) : 1.0; + gamma=1.0/(fabs(StringToDouble(value,(char **) NULL)) < MagickEpsilon ? + MagickEpsilon : StringToDouble(value,(char **) NULL)); film_gamma=FilmGamma; value=GetImageProperty(image,"film-gamma",exception); if (value != (const char *) NULL) @@ -2150,8 +2150,8 @@ static MagickBooleanType TransformsRGBImage(Image *image, gamma=DisplayGamma; value=GetImageProperty(image,"gamma",exception); if (value != (const char *) NULL) - gamma=1.0/fabs(StringToDouble(value,(char **) NULL)) >= - MagickEpsilon ? StringToDouble(value,(char **) NULL) : 1.0; + gamma=1.0/(fabs(StringToDouble(value,(char **) NULL)) < MagickEpsilon ? + MagickEpsilon : 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 c095b39a3..7653f7c24 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -950,7 +950,7 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion( channel=GetPixelChannelMapChannel(image,i); gamma=image_statistics[i].standard_deviation* reconstruct_statistics[channel].standard_deviation; - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : 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 882cba352..9ba106316 100644 --- a/MagickCore/composite-private.h +++ b/MagickCore/composite-private.h @@ -61,7 +61,7 @@ static inline void CompositePixelOver(const Image *image,const PixelInfo *p, Sa=QuantumScale*alpha; Da=QuantumScale*beta, gamma=Sa*(-Da)+Sa+Da; - gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(gamma < MagickEpsilon ? MagickEpsilon : gamma); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel @@ -132,7 +132,7 @@ static inline void CompositePixelInfoOver(const PixelInfo *p, Da=QuantumScale*beta, gamma=Sa*(-Da)+Sa+Da; composite->alpha=(MagickRealType) QuantumRange*gamma; - gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs(gamma) < MagickEpsilon ? MagickEpsilon : 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 +161,7 @@ static inline void CompositePixelInfoPlus(const PixelInfo *p, Da=QuantumScale*beta; gamma=RoundToUnity(Sa+Da); /* 'Plus' blending -- not 'Over' blending */ composite->alpha=(MagickRealType) QuantumRange*gamma; - gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs(gamma) < MagickEpsilon ? MagickEpsilon : 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 1fc266b4a..b64d1fed5 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -502,7 +502,7 @@ static MagickBooleanType CompositeOverImage(Image *image, */ Sc=(MagickRealType) GetPixelChannel(composite_image,channel,p); Dc=(MagickRealType) q[i]; - gamma=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha); + gamma=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha); q[i]=ClampToQuantum(gamma*(Sa*Sc-Sa*Da*Dc+Da*Dc)); } p+=GetPixelChannels(composite_image); @@ -1649,7 +1649,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, default: break; } - gamma=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha); + gamma=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha); pixel=Dc; switch (compose) { diff --git a/MagickCore/distort.c b/MagickCore/distort.c index e1ab25936..a26f227b7 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -1798,28 +1798,28 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, 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) ? 1.0 : scale ); + scale=1.0/(fabs(scale) < MagickEpsilon ? MagickEpsilon : 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) ? 1.0 : scale ); + scale=1.0/(fabs(scale) < MagickEpsilon ? MagickEpsilon : 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) ? 1.0 : scale ); + scale=1.0/(fabs(scale) < MagickEpsilon ? MagickEpsilon : 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) ? 1.0 : scale ); + scale=1.0/(fabs(scale) < MagickEpsilon ? MagickEpsilon : 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 bc18dea61..061e9e8de 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -3180,7 +3180,7 @@ static inline MagickRealType GetStopColorOffset(const GradientInfo *gradient, 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 ? 1.0 : gamma); + gamma=1.0/(gamma < MagickEpsilon ? MagickEpsilon : 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 96974d0b8..c67c47f29 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -171,7 +171,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, const double sigma,ExceptionInfo *exception) { #define AdaptiveBlurImageTag "Convolve/Image" -#define MagickSigma (fabs(sigma) <= MagickEpsilon ? 1.0 : sigma) +#define MagickSigma (fabs(sigma) < MagickEpsilon ? MagickEpsilon : sigma) CacheView *blur_view, @@ -407,7 +407,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, pixels+=GetPixelChannels(image); } } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q); continue; } @@ -425,7 +425,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, pixels+=GetPixelChannels(image); } } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q); } q+=GetPixelChannels(blur_image); @@ -498,7 +498,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, const double sigma,ExceptionInfo *exception) { #define AdaptiveSharpenImageTag "Convolve/Image" -#define MagickSigma (fabs(sigma) <= MagickEpsilon ? 1.0 : sigma) +#define MagickSigma (fabs(sigma) < MagickEpsilon ? MagickEpsilon : sigma) CacheView *sharp_view, @@ -734,7 +734,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, pixels+=GetPixelChannels(image); } } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(sharp_image,channel,ClampToQuantum(gamma*pixel),q); continue; } @@ -752,7 +752,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, pixels+=GetPixelChannels(image); } } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(sharp_image,channel,ClampToQuantum(gamma*pixel),q); } q+=GetPixelChannels(sharp_image); @@ -1050,7 +1050,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius, k++; pixels+=GetPixelChannels(image); } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q); } p+=GetPixelChannels(image); @@ -1180,7 +1180,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius, k++; pixels+=GetPixelChannels(blur_image); } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q); } p+=GetPixelChannels(blur_image); @@ -2059,7 +2059,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, gamma+=(*k)*alpha; k++; } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q); } p+=GetPixelChannels(image); @@ -2842,7 +2842,7 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle, pixel+=r[i]; gamma++; } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q); continue; } @@ -2860,7 +2860,7 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle, pixel+=GetPixelAlpha(image,r)*r[i]; gamma+=GetPixelAlpha(image,r); } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q); } p+=GetPixelChannels(image); @@ -3138,7 +3138,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, SetPixelChannel(blur_image,channel,p[center+i],q); continue; } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q); continue; } @@ -3164,7 +3164,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, SetPixelChannel(blur_image,channel,p[center+i],q); continue; } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(blur_image,channel,ClampToQuantum(gamma*pixel),q); } p+=GetPixelChannels(image); diff --git a/MagickCore/feature.c b/MagickCore/feature.c index 0d8e695e3..2266ac239 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -572,7 +572,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, break; } } - normalize=1.0/(fabs((double) normalize) <= MagickEpsilon ? 1.0 : normalize); + normalize=1.0/(fabs((double) normalize) < MagickEpsilon ? MagickEpsilon : normalize); for (y=0; y < (ssize_t) number_grays; y++) { register ssize_t diff --git a/MagickCore/fx.c b/MagickCore/fx.c index e6adcde00..a33bce407 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -2209,7 +2209,7 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info, case EqualOperator: { *beta=FxEvaluateSubexpression(fx_info,channel,x,y,++p,beta,exception); - return(fabs(alpha-(*beta)) <= MagickEpsilon ? 1.0 : 0.0); + return(fabs(alpha-(*beta)) < MagickEpsilon ? MagickEpsilon : 0.0); } case NotEqualOperator: { diff --git a/MagickCore/image.c b/MagickCore/image.c index 80abcb8c0..c6cbdd767 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -2087,7 +2087,7 @@ static inline void FlattenPixelInfo(const Image *image,const PixelInfo *p, Sa=QuantumScale*alpha; Da=QuantumScale*beta, gamma=Sa*(-Da)+Sa+Da; - gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(gamma < MagickEpsilon ? MagickEpsilon : gamma); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index 05740d255..61b3cd9ad 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2721,7 +2721,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k_pixels+=GetPixelChannels(image); } /* Sync'ed channels, all channels are modified */ - gamma=(double)count/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=(double)count/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelRed(morphology_image,ClampToQuantum(gamma*result.red),q); SetPixelGreen(morphology_image,ClampToQuantum(gamma*result.green),q); SetPixelBlue(morphology_image,ClampToQuantum(gamma*result.blue),q); @@ -2965,7 +2965,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, k_pixels += virt_width*GetPixelChannels(image); } /* Sync'ed channels, all channels are modified */ - gamma=(double)count/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=(double)count/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelRed(morphology_image, ClampToQuantum(gamma*result.red),q); SetPixelGreen(morphology_image, diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index 914668fd8..12f478117 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -214,7 +214,7 @@ static inline Quantum GetPixelIntensity(const Image *restrict image, pixel[image->channel_map[GreenPixelChannel].offset]; beta=pixel[image->channel_map[GreenPixelChannel].offset]-(double) pixel[image->channel_map[BluePixelChannel].offset]; - if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) + if ((fabs((double) alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) return(pixel[image->channel_map[RedPixelChannel].offset]); return((Quantum) (0.299*pixel[image->channel_map[RedPixelChannel].offset]+ 0.587*pixel[image->channel_map[GreenPixelChannel].offset]+0.114* @@ -370,7 +370,7 @@ static inline MagickBooleanType IsPixelGray(const Image *restrict image, pixel[image->channel_map[GreenPixelChannel].offset]; beta=pixel[image->channel_map[GreenPixelChannel].offset]-(double) pixel[image->channel_map[BluePixelChannel].offset]; - if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) + if ((fabs((double) alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) return(MagickTrue); } #endif @@ -427,7 +427,7 @@ static inline MagickBooleanType IsPixelMonochrome(const Image *restrict image, pixel[image->channel_map[BluePixelChannel].offset]; if (((fabs(pixel[image->channel_map[RedPixelChannel].offset]) <= MagickEpsilon) || (fabs(pixel[image->channel_map[RedPixelChannel].offset]-QuantumRange) <= MagickEpsilon)) && - (fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) + (fabs((double) alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) return(MagickTrue); } #endif @@ -452,7 +452,7 @@ static inline MagickBooleanType IsPixelInfoGray( alpha=pixel_info->red-(double) pixel_info->green; beta=pixel_info->green-(double) pixel_info->blue; - if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) + if ((fabs((double) alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) return(MagickTrue); } #endif @@ -477,7 +477,7 @@ static inline MagickBooleanType IsPixelInfoMonochrome( beta=pixel_info->green-(double) pixel_info->blue; if (((fabs(pixel_info->red) <= MagickEpsilon) || (fabs(pixel_info->red-QuantumRange) <= MagickEpsilon)) && - (fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) + (fabs((double) alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) return(MagickTrue); } #endif diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 10d1e410a..c9a975755 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -4135,7 +4135,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image, } for (i=0; i < 16; i++) { - gamma=1.0/(fabs((double) alpha[i]) <= MagickEpsilon ? 1.0 : alpha[i]); + gamma=1.0/(fabs((double) alpha[i]) < MagickEpsilon ? MagickEpsilon : alpha[i]); *pixel+=gamma*0.0625*pixels[i]; } break; @@ -4220,7 +4220,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image, 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 ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); *pixel=gamma*(epsilon.y*(epsilon.x*pixels[0]+delta.x*pixels[1])+delta.y* (epsilon.x*pixels[2]+delta.x*pixels[3])); break; @@ -4327,7 +4327,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image, */ delta.y=1.0-delta.y; gamma=MeshInterpolate(&delta,alpha[2],alpha[3],alpha[0]); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); *pixel=gamma*MeshInterpolate(&delta,pixels[2],pixels[3], pixels[0]); } @@ -4338,7 +4338,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image, */ delta.x=1.0-delta.x; gamma=MeshInterpolate(&delta,alpha[1],alpha[0],alpha[3]); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); *pixel=gamma*MeshInterpolate(&delta,pixels[1],pixels[0], pixels[3]); } @@ -4354,7 +4354,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image, Top-left triangle (pixel: 0, diagonal: 1-2). */ gamma=MeshInterpolate(&delta,alpha[0],alpha[1],alpha[2]); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); *pixel=gamma*MeshInterpolate(&delta,pixels[0],pixels[1], pixels[2]); } @@ -4366,7 +4366,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image, 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 ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); *pixel=gamma*MeshInterpolate(&delta,pixels[3],pixels[2], pixels[1]); } @@ -4415,7 +4415,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image, for (j=(-1); j < 3L; j++) { dx=CubicWeightingFunction(delta.x-(MagickRealType) j); - gamma=1.0/(fabs((double) alpha[n]) <= MagickEpsilon ? 1.0 : alpha[n]); + gamma=1.0/(fabs((double) alpha[n]) < MagickEpsilon ? MagickEpsilon : alpha[n]); *pixel+=gamma*dx*dy*pixels[n]; n++; } @@ -4542,7 +4542,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, alpha[j]=QuantumScale*GetPixelAlpha(source,p+j* GetPixelChannels(source)); pixels[j]*=alpha[j]; - gamma=1.0/(fabs((double) alpha[j]) <= MagickEpsilon ? 1.0 : alpha[j]); + gamma=1.0/(fabs((double) alpha[j]) < MagickEpsilon ? MagickEpsilon : alpha[j]); sum+=gamma*0.0625*pixels[j]; } SetPixelChannel(destination,channel,ClampToQuantum(sum),pixel); @@ -4641,7 +4641,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, if ((traits & BlendPixelTrait) == 0) { gamma=((epsilon.y*(epsilon.x+delta.x)+delta.y*(epsilon.x+delta.x))); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : 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); @@ -4659,7 +4659,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, 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 ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : 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); @@ -4813,7 +4813,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, */ delta.y=1.0-delta.y; gamma=MeshInterpolate(&delta,alpha[2],alpha[3],alpha[0]); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(destination,channel,ClampToQuantum(gamma* MeshInterpolate(&delta,pixels[2],pixels[3],pixels[0])),pixel); } @@ -4824,7 +4824,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, */ delta.x=1.0-delta.x; gamma=MeshInterpolate(&delta,alpha[1],alpha[0],alpha[3]); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(destination,channel,ClampToQuantum(gamma* MeshInterpolate(&delta,pixels[1],pixels[0],pixels[3])),pixel); } @@ -4840,7 +4840,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, Top-left triangle (pixel: 0, diagonal: 1-2). */ gamma=MeshInterpolate(&delta,alpha[0],alpha[1],alpha[2]); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(destination,channel,ClampToQuantum(gamma* MeshInterpolate(&delta,pixels[0],pixels[1],pixels[2])),pixel); } @@ -4852,7 +4852,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, 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 ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(destination,channel,ClampToQuantum(gamma* MeshInterpolate(&delta,pixels[3],pixels[2],pixels[1])),pixel); } @@ -4917,7 +4917,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, for (k=(-1); k < 3L; k++) { dx=CubicWeightingFunction(delta.x-(MagickRealType) k); - gamma=1.0/(fabs((double) alpha[n]) <= MagickEpsilon ? 1.0 : + gamma=1.0/(fabs((double) alpha[n]) < MagickEpsilon ? MagickEpsilon : alpha[n]); sum+=gamma*dx*dy*pixels[n]; n++; @@ -5105,7 +5105,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, pixel->alpha=0.0; for (i=0; i < 16L; i++) { - gamma=1.0/(fabs((double) alpha[i]) <= MagickEpsilon ? 1.0 : alpha[i]); + gamma=1.0/(fabs((double) alpha[i]) < MagickEpsilon ? MagickEpsilon : 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; @@ -5182,7 +5182,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, 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 ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : 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* @@ -5196,7 +5196,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, 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 ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : 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)); @@ -5281,7 +5281,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, */ delta.y=1.0-delta.y; gamma=MeshInterpolate(&delta,alpha[2],alpha[3],alpha[0]); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); pixel->red=gamma*MeshInterpolate(&delta,pixels[2].red, pixels[3].red,pixels[0].red); pixel->green=gamma*MeshInterpolate(&delta,pixels[2].green, @@ -5302,7 +5302,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, */ delta.x=1.0-delta.x; gamma=MeshInterpolate(&delta,alpha[1],alpha[0],alpha[3]); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); pixel->red=gamma*MeshInterpolate(&delta,pixels[1].red, pixels[0].red,pixels[3].red); pixel->green=gamma*MeshInterpolate(&delta,pixels[1].green, @@ -5328,7 +5328,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, Top-left triangle (pixel: 0, diagonal: 1-2). */ gamma=MeshInterpolate(&delta,alpha[0],alpha[1],alpha[2]); - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); pixel->red=gamma*MeshInterpolate(&delta,pixels[0].red, pixels[1].red,pixels[2].red); pixel->green=gamma*MeshInterpolate(&delta,pixels[0].green, @@ -5350,7 +5350,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, 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 ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); pixel->red=gamma*MeshInterpolate(&delta,pixels[3].red, pixels[2].red,pixels[1].red); pixel->green=gamma*MeshInterpolate(&delta,pixels[3].green, @@ -5435,7 +5435,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, for (j=(-1); j < 3L; j++) { dx=CubicWeightingFunction(delta.x-(MagickRealType) j); - gamma=1.0/(fabs((double) alpha[n]) <= MagickEpsilon ? 1.0 : alpha[n]); + gamma=1.0/(fabs((double) alpha[n]) < MagickEpsilon ? MagickEpsilon : 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 a4c3d7be2..2f7a30711 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -1251,7 +1251,7 @@ static size_t DefineImageColormap(Image *image,CubeInfo *cube_info, */ q=image->colormap+image->colors; alpha=(MagickRealType) ((MagickOffsetType) node_info->number_unique); - alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha); + alpha=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha); if (cube_info->associate_alpha == MagickFalse) { q->red=(double) ClampToQuantum((MagickRealType) @@ -1285,7 +1285,7 @@ static size_t DefineImageColormap(Image *image,CubeInfo *cube_info, gamma; gamma=(MagickRealType) (QuantumScale*q->alpha); - gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs(gamma) < MagickEpsilon ? MagickEpsilon : 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 2c2154e3a..c468b89e2 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -3609,7 +3609,7 @@ MagickExport size_t ImportQuantumPixels(const Image *image, continue; } Sa=QuantumScale*GetPixelAlpha(image,q); - gamma=1.0/(fabs(Sa) <= MagickEpsilon ? 1.0 : Sa); + gamma=1.0/(fabs(Sa) < MagickEpsilon ? MagickEpsilon : Sa); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 3fe7b1e8f..d8cca9e74 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -2362,7 +2362,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, pixel+=alpha*p[k*GetPixelChannels(image)+i]; gamma+=alpha; } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(resize_image,channel,ClampToQuantum(gamma*pixel),q); } q+=GetPixelChannels(resize_image); @@ -2578,7 +2578,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, pixel+=alpha*p[k*GetPixelChannels(image)+i]; gamma+=alpha; } - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); SetPixelChannel(resize_image,channel,ClampToQuantum(gamma*pixel),q); } q+=GetPixelChannels(resize_image); @@ -3209,7 +3209,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, } alpha=QuantumScale*scanline[x*GetPixelChannels(image)+ GetPixelChannelMapChannel(image,AlphaPixelChannel)]; - gamma=1.0/(fabs((double) alpha) <= MagickEpsilon ? 1.0 : alpha); + gamma=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha); SetPixelChannel(scale_image,channel,ClampToQuantum(gamma*scanline[ x*GetPixelChannels(image)+offset]),q); } @@ -3311,7 +3311,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, } alpha=QuantumScale*scanline[x*GetPixelChannels(image)+ GetPixelChannelMapChannel(image,AlphaPixelChannel)]; - gamma=1.0/(fabs((double) alpha) <= MagickEpsilon ? 1.0 : alpha); + gamma=1.0/(fabs((double) alpha) < MagickEpsilon ? MagickEpsilon : alpha); SetPixelChannel(scale_image,channel,ClampToQuantum(gamma* scale_scanline[x*MaxPixelChannels+channel]),q); } diff --git a/coders/pango.c b/coders/pango.c index 5d6221e40..277d2de63 100644 --- a/coders/pango.c +++ b/coders/pango.c @@ -424,7 +424,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info, Disassociate alpha. */ gamma=1.0-QuantumScale*fill_color.alpha; - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); fill_color.blue*=gamma; fill_color.green*=gamma; fill_color.red*=gamma; diff --git a/coders/svg.c b/coders/svg.c index 6f8eb5f5c..d4aab7489 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -2939,7 +2939,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) gamma; gamma=1.0-QuantumScale*fill_color.alpha; - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + gamma=1.0/(fabs((double) gamma) < MagickEpsilon ? MagickEpsilon : gamma); fill_color.blue*=gamma; fill_color.green*=gamma; fill_color.red*=gamma;