averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-06-08 15:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

correct NCC metric

Browse Source
This commit is contained in:
Cristy
2025-05-14 19:23:30 -04:00
parent 6a4ded4ee8
commit acf6ddd7d9
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MagickCore/compare.c
+12 -7
View File
@@ -457,10 +457,10 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image,
else
delta=QuantumScale*(Sa*(double) p[i]-Da*(double) GetPixelChannel(
reconstruct_image,channel,q));
if ((QuantumRange*delta*delta) >= fuzz)
if ((delta*delta) >= fuzz)
{
channel_distortion[i]+=fabs(delta);
channel_distortion[CompositePixelChannel]+=fabs(delta);
channel_distortion[i]++;
channel_distortion[CompositePixelChannel]++;
}
}
channel_area++;
@@ -792,7 +792,8 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
double
area = 0.0,
maximum_error = MagickMinimumValue;
maximum_error = MagickMinimumValue,
mean_error = 0.0;
MagickBooleanType
status = MagickTrue;
@@ -821,7 +822,8 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
double
channel_area = 0.0,
channel_distortion[MaxPixelChannels+1] = { 0.0 },
channel_maximum_error = MagickMinimumValue;
channel_maximum_error = MagickMinimumValue,
channel_mean_error = 0.0;
ssize_t
x;
@@ -873,6 +875,7 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
GetPixelChannel(reconstruct_image,channel,q));
channel_distortion[i]+=distance;
channel_distortion[CompositePixelChannel]+=distance;
channel_mean_error+=distance*distance;
if (distance > channel_maximum_error)
channel_maximum_error=distance;
}
@@ -901,6 +904,7 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
}
distortion[CompositePixelChannel]+=
channel_distortion[CompositePixelChannel];
mean_error+=channel_mean_error;
maximum_error+=channel_maximum_error;
}
}
@@ -920,8 +924,9 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image,
}
distortion[CompositePixelChannel]*=area;
distortion[CompositePixelChannel]/=(double) GetImageChannels(image);
image->error.mean_error_per_pixel=distortion[CompositePixelChannel];
image->error.normalized_mean_error=distortion[CompositePixelChannel];
image->error.mean_error_per_pixel=QuantumRange*
distortion[CompositePixelChannel];
image->error.normalized_mean_error=mean_error;
image->error.normalized_maximum_error=maximum_error;
return(status);
}
MagickWand/compare.c
+9 -5
View File
@@ -1309,8 +1309,12 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
break;
}
case NormalizedCrossCorrelationErrorMetric:
case PhaseCorrelationErrorMetric:
case StructuralDissimilarityErrorMetric:
{
similarity_metric=1.0-similarity_metric;
break;
}
case PhaseCorrelationErrorMetric:
case UndefinedErrorMetric:
{
distortion=1.0-distortion;
@@ -1342,9 +1346,9 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
case MeanErrorPerPixelErrorMetric:
{
(void) FormatLocaleFile(stderr,"%.*g (%.*g, %.*g)",
GetMagickPrecision(),QuantumRange*distortion,
GetMagickPrecision(),image->error.normalized_mean_error,
GetMagickPrecision(),image->error.normalized_maximum_error);
GetMagickPrecision(),scale*distortion,
GetMagickPrecision(),distortion,GetMagickPrecision(),
image->error.normalized_maximum_error);
break;
}
default:
@@ -1519,7 +1523,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
{
(void) FormatLocaleFile(stderr," %.*g (%.*g, %.*g)\n",
GetMagickPrecision(),channel_distortion[MaxPixelChannels],
GetMagickPrecision(),image->error.normalized_mean_error,
GetMagickPrecision(),channel_distortion[MaxPixelChannels],
GetMagickPrecision(),image->error.normalized_maximum_error);
break;
}