Skip to content

Commit c354e6f

Browse files
author
Cristy
committed
eliminate compile exception
1 parent 1f10976 commit c354e6f

File tree

1 file changed

+14
-33
lines changed

1 file changed

+14
-33
lines changed

magick/compare.c

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2113,7 +2113,7 @@ static double GetSimilarityMetric(const Image *image,
21132113
geometry;
21142114

21152115
size_t
2116-
length = MaxPixelChannels+1UL;
2116+
length = CompositeChannels+1UL;
21172117

21182118
SetGeometry(reconstruct_image,&geometry);
21192119
geometry.x=x_offset;
@@ -2135,87 +2135,68 @@ static double GetSimilarityMetric(const Image *image,
21352135
case AbsoluteErrorMetric:
21362136
{
21372137
status=GetAESimilarity(similarity_image,reconstruct_image,
2138-
channel_similarity,exception);
2139-
break;
2140-
}
2141-
case DotProductCorrelationErrorMetric:
2142-
case PhaseCorrelationErrorMetric:
2143-
{
2144-
status=GetMSESimilarity(similarity_image,reconstruct_image,
2145-
channel_similarity,exception);
2138+
DefaultChannels,channel_similarity,exception);
21462139
break;
21472140
}
21482141
case FuzzErrorMetric:
21492142
{
21502143
status=GetFUZZSimilarity(similarity_image,reconstruct_image,
2151-
channel_similarity,exception);
2144+
DefaultChannels,channel_similarity,exception);
21522145
break;
21532146
}
21542147
case MeanAbsoluteErrorMetric:
21552148
{
21562149
status=GetMAESimilarity(similarity_image,reconstruct_image,
2157-
channel_similarity,exception);
2150+
DefaultChannels,channel_similarity,exception);
21582151
break;
21592152
}
2160-
case MeanErrorPerPixelErrorMetric:
2153+
case MeanErrorPerPixelMetric:
21612154
{
21622155
status=GetMEPPSimilarity(similarity_image,reconstruct_image,
2163-
channel_similarity,exception);
2156+
DefaultChannels,channel_similarity,exception);
21642157
break;
21652158
}
21662159
case MeanSquaredErrorMetric:
21672160
{
21682161
status=GetMSESimilarity(similarity_image,reconstruct_image,
2169-
channel_similarity,exception);
2162+
DefaultChannels,channel_similarity,exception);
21702163
break;
21712164
}
21722165
case NormalizedCrossCorrelationErrorMetric:
21732166
{
21742167
status=GetNCCSimilarity(similarity_image,reconstruct_image,
2175-
channel_similarity,exception);
2168+
DefaultChannels,channel_similarity,exception);
21762169
break;
21772170
}
21782171
case PeakAbsoluteErrorMetric:
21792172
{
21802173
status=GetPASimilarity(similarity_image,reconstruct_image,
2181-
channel_similarity,exception);
2174+
DefaultChannels,channel_similarity,exception);
21822175
break;
21832176
}
2184-
case PeakSignalToNoiseRatioErrorMetric:
2177+
case PeakSignalToNoiseRatioMetric:
21852178
{
21862179
status=GetPSNRSimilarity(similarity_image,reconstruct_image,
2187-
channel_similarity,exception);
2180+
DefaultChannels,channel_similarity,exception);
21882181
break;
21892182
}
21902183
case PerceptualHashErrorMetric:
21912184
{
21922185
status=GetPHASHSimilarity(similarity_image,reconstruct_image,
2193-
channel_similarity,exception);
2186+
DefaultChannels,channel_similarity,exception);
21942187
break;
21952188
}
21962189
case RootMeanSquaredErrorMetric:
21972190
case UndefinedErrorMetric:
21982191
default:
21992192
{
22002193
status=GetRMSESimilarity(similarity_image,reconstruct_image,
2201-
channel_similarity,exception);
2202-
break;
2203-
}
2204-
case StructuralDissimilarityErrorMetric:
2205-
{
2206-
status=GetDSSIMSimilarity(similarity_image,reconstruct_image,
2207-
channel_similarity,exception);
2208-
break;
2209-
}
2210-
case StructuralSimilarityErrorMetric:
2211-
{
2212-
status=GetSSIMSimularity(similarity_image,reconstruct_image,
2213-
channel_similarity,exception);
2194+
DefaultChannels,channel_similarity,exception);
22142195
break;
22152196
}
22162197
}
22172198
similarity_image=DestroyImage(similarity_image);
2218-
similarity=channel_similarity[CompositePixelChannel];
2199+
similarity=channel_similarity[CompositeChannels];
22192200
channel_similarity=(double *) RelinquishMagickMemory(channel_similarity);
22202201
if (status == MagickFalse)
22212202
return(NAN);

0 commit comments

Comments
 (0)