averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-05-31 11:18:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

correct NCC metric

Browse Source
This commit is contained in:
Cristy
2025-06-06 19:19:45 -04:00
parent c59c9fa259
commit 349e5ec586
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MagickCore/compare.c
+21 -16
View File
@@ -3459,12 +3459,13 @@ static Image *DPCSimilarityImage(const Image *image,const Image *reconstruct,
status=SIMMaximaImage(dot_product_image,&maxima,offset,exception);
if (status == MagickFalse)
ThrowDPCSimilarityException();
if (QuantumScale*maxima > 1.0)
{
status=SIMMultiplyImage(dot_product_image,1.0/(QuantumScale*maxima),
(const ChannelStatistics *) NULL,exception);
maxima=(double) QuantumRange;
}
*similarity_metric=QuantumScale*maxima;
if (IsNaN(maxima) != 0)
*similarity_metric=1.0;
else
if (*similarity_metric > 1.0)
*similarity_metric=1.0;
return(dot_product_image);
}
@@ -3619,12 +3620,9 @@ static Image *MSESimilarityImage(const Image *image,const Image *reconstruct,
ThrowMSESimilarityException();
alpha_image=DestroyImage(alpha_image);
beta_image=DestroyImage(beta_image);
if (QuantumScale*minima < 0.0)
minima=0.0;
*similarity_metric=QuantumScale*minima;
if ((IsNaN(minima) != 0) || (*similarity_metric <= FLT_EPSILON))
*similarity_metric=0.0;
else
if (*similarity_metric > 1.0)
*similarity_metric=1.0;
return(mse_image);
}
@@ -3773,7 +3771,13 @@ static Image *NCCSimilarityImage(const Image *image,const Image *reconstruct,
status=SIMMaximaImage(ncc_image,&maxima,offset,exception);
if (status == MagickFalse)
ThrowNCCSimilarityException();
*similarity_metric=MagickMin(QuantumScale*maxima,1.0);
if (QuantumScale*maxima > 1.0)
{
status=SIMMultiplyImage(ncc_image,1.0/(QuantumScale*maxima),
(const ChannelStatistics *) NULL,exception);
maxima=(double) QuantumRange;
}
*similarity_metric=QuantumScale*maxima;
return(ncc_image);
}
@@ -3917,12 +3921,13 @@ static Image *PhaseSimilarityImage(const Image *image,const Image *reconstruct,
if (status == MagickFalse)
ThrowPhaseSimilarityException();
magnitude_image=DestroyImage(magnitude_image);
if (QuantumScale*maxima > 1.0)
{
status=SIMMultiplyImage(phase_image,1.0/(QuantumScale*maxima),
(const ChannelStatistics *) NULL,exception);
maxima=(double) QuantumRange;
}
*similarity_metric=QuantumScale*maxima;
if (IsNaN(maxima) != 0)
*similarity_metric=1.0;
else
if (*similarity_metric > 1.0)
*similarity_metric=1.0;
return(phase_image);
}