From 9cb4b4bae672cd7f4e2355545eafb85f6a192752 Mon Sep 17 00:00:00 2001
From: "Gregory R. Lee" <gregory.lee@cchmc.org>
Date: Fri, 15 May 2015 10:33:30 -0400
Subject: [PATCH] revise argument handling code for multichannel case

---
 skimage/measure/_structural_similarity.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/skimage/measure/_structural_similarity.py b/skimage/measure/_structural_similarity.py
index 0854a1a8..e79a6217 100644
--- a/skimage/measure/_structural_similarity.py
+++ b/skimage/measure/_structural_similarity.py
@@ -136,10 +136,14 @@ def structural_similarity(X, Y, win_size=None, gradient=False,
 
     if multichannel:
         # loop over channels
-        args = locals()
-        args.pop('X')
-        args.pop('Y')
-        args['multichannel'] = False
+        args = dict(win_size=win_size,
+                    gradient=gradient,
+                    dynamic_range=dynamic_range,
+                    multichannel=False,
+                    gaussian_weights=gaussian_weights,
+                    full=full,
+                    image_content_weighting=image_content_weighting)
+        args.update(kwargs)
         nch = X.shape[-1]
         mssim = np.empty(nch)
         if gradient: