Commit 6a3f8ab64 for imagemagick.org
commit 6a3f8ab6444b3678d84e0d1a8d0b51939ae492b5
Author: Cristy <urban-warrior@imagemagick.org>
Date: Sat Jun 28 13:07:47 2025 -0400
revert
diff --git a/MagickCore/color.c b/MagickCore/color.c
index 5ad5784ab..599eefbfb 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -1685,7 +1685,7 @@ MagickPrivate MagickBooleanType IsEquivalentAlpha(const Image *image,
return(MagickTrue);
fuzz=p->fuzz*p->fuzz+q->fuzz*q->fuzz;
pixel=(double) p->alpha-(double) q->alpha;
- if ((pixel*pixel) >= fuzz)
+ if ((pixel*pixel) > fuzz)
return(MagickFalse);
return(MagickTrue);
}
@@ -1855,7 +1855,7 @@ MagickPrivate MagickBooleanType IsEquivalentIntensity(const Image *image,
return(MagickTrue);
fuzz=p->fuzz*p->fuzz+q->fuzz*q->fuzz;
pixel=GetPixelInfoIntensity(image,p)-GetPixelInfoIntensity(image,q);
- if ((pixel*pixel) >= fuzz)
+ if ((pixel*pixel) > fuzz)
return(MagickFalse);
return(MagickTrue);
}
diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index bcd32f4d1..e24546758 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -397,7 +397,7 @@ static MagickBooleanType GetAESimilarity(const Image *image,
GetPixelChannel(reconstruct_image,channel,q);
else
error=Sa*p[i]-Da*GetPixelChannel(reconstruct_image,channel,q);
- if ((error*error) >= fuzz)
+ if ((error*error) > fuzz)
{
channel_similarity[i]++;
count++;
@@ -529,7 +529,7 @@ static MagickBooleanType GetFUZZSimilarity(const Image *image,
GetPixelChannel(reconstruct_image,channel,q);
else
error=Sa*p[i]-Da*GetPixelChannel(reconstruct_image,channel,q);
- if ((error*error) >= fuzz)
+ if ((error*error) > fuzz)
{
channel_similarity[i]+=QuantumScale*error*QuantumScale*error;
channel_similarity[CompositePixelChannel]+=QuantumScale*error*
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 57a5750d2..f576f5689 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -5947,7 +5947,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixel(const Image *image,
else
error=alpha*(double) p[i]-target_alpha*
GetPixelChannel(target_image,channel,q);
- if ((error*error) >= fuzz)
+ if ((error*error) > fuzz)
return(MagickFalse);
}
return(MagickTrue);
@@ -6019,7 +6019,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p,
(double) OpaqueAlpha)-(q->alpha_trait != UndefinedPixelTrait ?
q->alpha : (double) OpaqueAlpha);
distance=pixel*pixel;
- if (distance >= fuzz)
+ if (distance > fuzz)
return(MagickFalse);
/*
Generate a alpha scaling factor to generate a 4D cone on colorspace.
@@ -6039,7 +6039,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p,
{
pixel=p->black-q->black;
distance+=pixel*pixel*scale;
- if (distance >= fuzz)
+ if (distance > fuzz)
return(MagickFalse);
scale*=QuantumScale*((double) QuantumRange-(double) p->black);
scale*=QuantumScale*((double) QuantumRange-(double) q->black);
@@ -6062,15 +6062,15 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p,
pixel*=2.0;
}
distance+=pixel*pixel*scale;
- if (distance >= fuzz)
+ if (distance > fuzz)
return(MagickFalse);
pixel=p->green-q->green;
distance+=pixel*pixel*scale;
- if (distance >= fuzz)
+ if (distance > fuzz)
return(MagickFalse);
pixel=p->blue-q->blue;
distance+=pixel*pixel*scale;
- if (distance >= fuzz)
+ if (distance > fuzz)
return(MagickFalse);
return(MagickTrue);
}
diff --git a/tests/validate.c b/tests/validate.c
index 095b6d5bb..b59845907 100644
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -1270,7 +1270,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
continue;
}
difference_image=DestroyImage(difference_image);
- if ((QuantumScale*distortion) >= fuzz)
+ if ((QuantumScale*distortion) > fuzz)
{
(void) FormatLocaleFile(stdout,"... fail (with distortion %g).\n",
QuantumScale*distortion);
@@ -1508,7 +1508,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
continue;
}
difference_image=DestroyImage(difference_image);
- if ((QuantumScale*distortion) >= fuzz)
+ if ((QuantumScale*distortion) > fuzz)
{
(void) FormatLocaleFile(stdout,"... fail (with distortion %g).\n",
QuantumScale*distortion);