From 55fc07edb966b307c27318d66cd669933c16e725 Mon Sep 17 00:00:00 2001 From: Dhruv Jawali Date: Sat, 13 Jun 2015 23:25:36 +0530 Subject: [PATCH] removed reduntant continue, added Cython flags and fixed negative indexing --- skimage/transform/_seam_carving.pyx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/skimage/transform/_seam_carving.pyx b/skimage/transform/_seam_carving.pyx index fb98d2b9..d8dc3945 100644 --- a/skimage/transform/_seam_carving.pyx +++ b/skimage/transform/_seam_carving.pyx @@ -1,3 +1,7 @@ +# cython: cdivision=True +# cython: boundscheck=False +# cython: nonecheck=False +# cython: wraparound=False import numpy as np cimport numpy as cnp @@ -190,7 +194,7 @@ def _seam_carve_v(img, energy_map, iters, border): energy_img = energy_map _preprocess_image(energy_img, cumulative_img, track_img, cols) - last_row[...] = cumulative_img[-1, :] + last_row[...] = cumulative_img[rows - 1, :] sorted_indices = np.argsort(last_row_obj) seam_idx = 0 @@ -199,14 +203,13 @@ def _seam_carve_v(img, energy_map, iters, border): seams_left -= 1 cols -= 1 seam_idx += 1 - continue else: seam_idx = 0 _remove_seam(image, seam_map, cols) _remove_seam(energy_img, seam_map, cols) seam_map[...] = 0 _preprocess_image(energy_img, cumulative_img, track_img, cols) - last_row[:cols] = cumulative_img[-1, :cols] + last_row[:cols] = cumulative_img[rows - 1, :cols] sorted_indices = np.argsort(last_row_obj) _remove_seam(image, seam_map, cols)