Merge pull request #1994 from grlee77/ssim_fix

avoid deprecation warnings when calling compute_ssim with multichannel=True
This commit is contained in:
Steven Silvester
2016-03-09 15:18:24 -06:00
+3 -3
View File
@@ -102,7 +102,7 @@ def compare_ssim(X, Y, win_size=None, gradient=False,
if full:
S = np.empty(X.shape)
for ch in range(nch):
ch_result = structural_similarity(X[..., ch], Y[..., ch], **args)
ch_result = compare_ssim(X[..., ch], Y[..., ch], **args)
if gradient and full:
mssim[..., ch], G[..., ch], S[..., ch] = ch_result
elif gradient:
@@ -226,6 +226,6 @@ def structural_similarity(X, Y, win_size=None, gradient=False,
gaussian_weights=False, full=False, **kwargs):
"""""" + compare_ssim.__doc__
return compare_ssim(X, Y, win_size=win_size, gradient=gradient,
dynamic_range=dynamic_range,
multichannel=multichannel,
dynamic_range=dynamic_range,
multichannel=multichannel,
gaussian_weights=gaussian_weights, full=full, **kwargs)