From f10c362b1a88535b2d5fee3210102a8c6e3a1366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 11 Oct 2013 17:34:47 +0200 Subject: [PATCH 1/2] Fix euler number bug for scipy-0.13 --- skimage/measure/_regionprops.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skimage/measure/_regionprops.py b/skimage/measure/_regionprops.py index 9078df6f..e6fe5c5e 100644 --- a/skimage/measure/_regionprops.py +++ b/skimage/measure/_regionprops.py @@ -4,7 +4,7 @@ from math import sqrt, atan2, pi as PI import numpy as np from scipy import ndimage -from skimage.morphology import convex_hull_image +from skimage.morphology import convex_hull_image, label from skimage.measure import _moments @@ -155,8 +155,8 @@ class _RegionProperties(object): @_cached_property def euler_number(self): euler_array = self.filled_image != self.image - _, num = ndimage.label(euler_array, STREL_8) - return -num + _, num = label(euler_array, neighbors=8, return_num=True) + return -num + 1 @_cached_property def extent(self): From 4e9cb03aebdbc26fac60d835a7150ec9b997eb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 11 Oct 2013 17:37:26 +0200 Subject: [PATCH 2/2] Add missing perimeter function to __all__ --- skimage/measure/_regionprops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/measure/_regionprops.py b/skimage/measure/_regionprops.py index e6fe5c5e..10ac785d 100644 --- a/skimage/measure/_regionprops.py +++ b/skimage/measure/_regionprops.py @@ -8,7 +8,7 @@ from skimage.morphology import convex_hull_image, label from skimage.measure import _moments -__all__ = ['regionprops'] +__all__ = ['regionprops', 'perimeter'] STREL_4 = np.array([[0, 1, 0],