Skip to content

Commit e2804cf

Browse files
author
Cristy
committed
correct NCC metric
1 parent 2eaddad commit e2804cf

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

magick/compare.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2241,7 +2241,7 @@ MagickExport Image *SimilarityMetricImage(Image *image,const Image *reconstruct,
22412241
similarity_info.x,similarity_info.y,exception);
22422242
progress=0;
22432243
similarity_view=AcquireVirtualCacheView(similarity_image,exception);
2244-
#if defined(MAGICKCORE_OPENMP_SUPPORT)
2244+
#if defined(MMAGICKCORE_OPENMP_SUPPORT)
22452245
#pragma omp parallel for schedule(static) shared(status,similarity_info) \
22462246
magick_number_threads(image,reconstruct,similarity_image->rows << 2,1)
22472247
#endif
@@ -2355,10 +2355,20 @@ MagickExport Image *SimilarityMetricImage(Image *image,const Image *reconstruct,
23552355
}
23562356
}
23572357
similarity_view=DestroyCacheView(similarity_view);
2358+
switch (metric)
2359+
{
2360+
case NormalizedCrossCorrelationErrorMetric:
2361+
{
2362+
similarity_info.similarity=1.0-similarity_info.similarity;
2363+
break;
2364+
}
2365+
default:
2366+
break;
2367+
}
2368+
if (status == MagickFalse)
2369+
similarity_image=DestroyImage(similarity_image);
23582370
*similarity_metric=similarity_info.similarity;
23592371
offset->x=similarity_info.x;
23602372
offset->y=similarity_info.y;
2361-
if (status == MagickFalse)
2362-
similarity_image=DestroyImage(similarity_image);
23632373
return(similarity_image);
23642374
}

0 commit comments

Comments
 (0)