From 0f175a86b2d3b957adae12c15d1cf8157e5eaaeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sun, 9 Sep 2012 21:34:42 +0200 Subject: [PATCH] Fix bug in laplacian pyramid caused by renamed variables --- skimage/transform/pyramids.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/skimage/transform/pyramids.py b/skimage/transform/pyramids.py index b6442bc6..bcd52352 100644 --- a/skimage/transform/pyramids.py +++ b/skimage/transform/pyramids.py @@ -261,31 +261,29 @@ def build_laplacian_pyramid(image, max_layer=-1, downscale=2, sigma=None, rows = image.shape[0] cols = image.shape[1] - prev_layer_image = image - _smooth(image, sigma, mode, cval) - yield prev_layer_image + smoothed_image = _smooth(image, sigma, mode, cval) + yield image - smoothed_image # build downsampled images until max_layer is reached or downsampled image # has size of 1 in one direction while layer != max_layer: layer += 1 - rows = prev_layer_image.shape[0] - cols = prev_layer_image.shape[1] + out_rows = math.ceil(rows / float(downscale)) out_cols = math.ceil(cols / float(downscale)) - resized = resize(prev_layer_image, (out_rows, out_cols), order=order, - mode=mode, cval=cval) - layer_image = _smooth(resized, sigma, mode, cval) + resized_image = resize(smoothed_image, (out_rows, out_cols), + order=order, mode=mode, cval=cval) + smoothed_image = _smooth(resized_image, sigma, mode, cval) prev_rows = rows prev_cols = cols - prev_layer_image = layer_image - rows = layer_image.shape[0] - cols = layer_image.shape[1] + rows = resized_image.shape[0] + cols = resized_image.shape[1] # no change to previous pyramid layer if prev_rows == rows and prev_cols == cols: break - yield layer_image + yield resized_image - smoothed_image