Skip to content

Commit ea0944a

Browse files
author
Cristy
committed
correct FUZZ metric
1 parent 643deeb commit ea0944a

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎magick/color.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1693,7 +1693,7 @@ MagickExport MagickBooleanType IsColorSimilar(const Image *image,
16931693
GetPixelOpacity(p) : OpaqueOpacity)-(image->matte != MagickFalse ?
16941694
q->opacity : OpaqueOpacity));
16951695
distance=pixel*pixel;
1696-
if (distance > fuzz)
1696+
if (distance >= fuzz)
16971697
return(MagickFalse);
16981698
/*
16991699
Generate a alpha scaling factor to generate a 4D cone on colorspace
@@ -1722,15 +1722,15 @@ MagickExport MagickBooleanType IsColorSimilar(const Image *image,
17221722
pixel*=2.0;
17231723
}
17241724
distance+=scale*pixel*pixel;
1725-
if (distance > fuzz)
1725+
if (distance >= fuzz)
17261726
return(MagickFalse);
17271727
pixel=(double) GetPixelGreen(p)-(double) q->green;
17281728
distance+=scale*pixel*pixel;
1729-
if (distance > fuzz)
1729+
if (distance >= fuzz)
17301730
return(MagickFalse);
17311731
pixel=(double) GetPixelBlue(p)-(double) q->blue;
17321732
distance+=scale*pixel*pixel;
1733-
if (distance > fuzz)
1733+
if (distance >= fuzz)
17341734
return(MagickFalse);
17351735
return(MagickTrue);
17361736
}
@@ -1906,7 +1906,7 @@ MagickPrivate MagickBooleanType IsIntensitySimilar(const Image *image,
19061906
return(MagickTrue);
19071907
fuzz=GetFuzzyColorDistance(image,(const Image *) NULL);
19081908
pixel=GetPixelIntensity(image,p)-GetPixelIntensity(image,q);
1909-
if ((pixel*pixel) > fuzz)
1909+
if ((pixel*pixel) >= fuzz)
19101910
return(MagickFalse);
19111911
return(MagickTrue);
19121912
}
@@ -1979,7 +1979,7 @@ MagickExport MagickBooleanType IsMagickColorSimilar(const MagickPixelPacket *p,
19791979
OpaqueOpacity)-(q->matte != MagickFalse ? (double) q->opacity :
19801980
(double) OpaqueOpacity);
19811981
distance=pixel*pixel;
1982-
if (distance > fuzz)
1982+
if (distance >= fuzz)
19831983
return(MagickFalse);
19841984
/*
19851985
Generate a alpha scaling factor to generate a 4D cone on colorspace.
@@ -1999,7 +1999,7 @@ MagickExport MagickBooleanType IsMagickColorSimilar(const MagickPixelPacket *p,
19991999
{
20002000
pixel=p->index-q->index;
20012001
distance+=pixel*pixel*scale;
2002-
if (distance > fuzz)
2002+
if (distance >= fuzz)
20032003
return(MagickFalse);
20042004
scale*=(MagickRealType) (QuantumScale*((double) QuantumRange-p->index));
20052005
scale*=(MagickRealType) (QuantumScale*((double) QuantumRange-q->index));
@@ -2022,15 +2022,15 @@ MagickExport MagickBooleanType IsMagickColorSimilar(const MagickPixelPacket *p,
20222022
pixel*=2.0;
20232023
}
20242024
distance+=pixel*pixel*scale;
2025-
if (distance > fuzz)
2025+
if (distance >= fuzz)
20262026
return(MagickFalse);
20272027
pixel=GetPixelGreen(p)-q->green;
20282028
distance+=pixel*pixel*scale;
2029-
if (distance > fuzz)
2029+
if (distance >= fuzz)
20302030
return(MagickFalse);
20312031
pixel=GetPixelBlue(p)-q->blue;
20322032
distance+=pixel*pixel*scale;
2033-
if (distance > fuzz)
2033+
if (distance >= fuzz)
20342034
return(MagickFalse);
20352035
return(MagickTrue);
20362036
}
@@ -2078,7 +2078,7 @@ MagickExport MagickBooleanType IsOpacitySimilar(const Image *image,
20782078
return(MagickTrue);
20792079
fuzz=GetFuzzyColorDistance(image,(const Image *) NULL);
20802080
pixel=(MagickRealType) GetPixelOpacity(p)-(MagickRealType) GetPixelOpacity(q);
2081-
if ((pixel*pixel) > fuzz)
2081+
if ((pixel*pixel) >= fuzz)
20822082
return(MagickFalse);
20832083
return(MagickTrue);
20842084
}

‎magick/compare.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ static MagickBooleanType GetFUZZSimilarity(const Image *image,
593593
if ((channel & RedChannel) != 0)
594594
{
595595
error=QuantumScale*(Sa*GetPixelRed(p)-Da*GetPixelRed(q));
596-
if ((error*error) > fuzz)
596+
if ((error*error) >= fuzz)
597597
{
598598
channel_similarity[RedChannel]+=error*error;
599599
channel_similarity[CompositeChannels]+=error*error;
@@ -603,7 +603,7 @@ static MagickBooleanType GetFUZZSimilarity(const Image *image,
603603
if ((channel & GreenChannel) != 0)
604604
{
605605
error=QuantumScale*(Sa*GetPixelGreen(p)-Da*GetPixelGreen(q));
606-
if ((error*error) > fuzz)
606+
if ((error*error) >= fuzz)
607607
{
608608
channel_similarity[GreenChannel]+=error*error;
609609
channel_similarity[CompositeChannels]+=error*error;
@@ -613,7 +613,7 @@ static MagickBooleanType GetFUZZSimilarity(const Image *image,
613613
if ((channel & BlueChannel) != 0)
614614
{
615615
error=QuantumScale*(Sa*GetPixelBlue(p)-Da*GetPixelBlue(q));
616-
if ((error*error) > fuzz)
616+
if ((error*error) >= fuzz)
617617
{
618618
channel_similarity[BlueChannel]+=error*error;
619619
channel_similarity[CompositeChannels]+=error*error;
@@ -623,7 +623,7 @@ static MagickBooleanType GetFUZZSimilarity(const Image *image,
623623
if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
624624
{
625625
error=QuantumScale*((double) GetPixelOpacity(p)-GetPixelOpacity(q));
626-
if ((error*error) > fuzz)
626+
if ((error*error) >= fuzz)
627627
{
628628
channel_similarity[OpacityChannel]+=error*error;
629629
channel_similarity[CompositeChannels]+=error*error;
@@ -635,7 +635,7 @@ static MagickBooleanType GetFUZZSimilarity(const Image *image,
635635
{
636636
error=QuantumScale*(Sa*GetPixelIndex(indexes+x)-Da*
637637
GetPixelIndex(reconstruct_indexes+x));
638-
if ((error*error) > fuzz)
638+
if ((error*error) >= fuzz)
639639
{
640640
channel_similarity[BlackChannel]+=error*error;
641641
channel_similarity[CompositeChannels]+=error*error;

‎tests/validate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,7 +1565,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
15651565
continue;
15661566
}
15671567
difference_image=DestroyImage(difference_image);
1568-
if ((QuantumScale*distortion) > fuzz)
1568+
if ((QuantumScale*distortion) >= fuzz)
15691569
{
15701570
(void) FormatLocaleFile(stdout,"... fail (with distortion %g).\n",
15711571
QuantumScale*distortion);
@@ -1802,7 +1802,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
18021802
continue;
18031803
}
18041804
difference_image=DestroyImage(difference_image);
1805-
if ((QuantumScale*distortion) > fuzz)
1805+
if ((QuantumScale*distortion) >= fuzz)
18061806
{
18071807
(void) FormatLocaleFile(stdout,"... fail (with distortion %g).\n",
18081808
QuantumScale*distortion);

0 commit comments

Comments
 (0)