wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-19 11:27:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed reduntant continue, added Cython flags and fixed negative indexing

Browse Source
This commit is contained in:
Dhruv Jawali
2015-06-13 23:25:36 +05:30
parent 557354668e
commit 55fc07edb9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/transform/_seam_carving.pyx
+6 -3
View File
@@ -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)