reverted irrelevant changes:

This commit is contained in:
Vighnesh Birodkar
2014-03-26 03:55:22 +05:30
parent ab06d0177b
commit dd8a14bf69
+6 -6
View File
@@ -23,14 +23,14 @@ PROPS = {
'CentralMoments': 'moments_central', 'CentralMoments': 'moments_central',
'Centroid': 'centroid', 'Centroid': 'centroid',
'ConvexArea': 'convex_area', 'ConvexArea': 'convex_area',
# 'ConvexHull', # 'ConvexHull',
'ConvexImage': 'convex_image', 'ConvexImage': 'convex_image',
'Coordinates': 'coords', 'Coordinates': 'coords',
'Eccentricity': 'eccentricity', 'Eccentricity': 'eccentricity',
'EquivDiameter': 'equivalent_diameter', 'EquivDiameter': 'equivalent_diameter',
'EulerNumber': 'euler_number', 'EulerNumber': 'euler_number',
'Extent': 'extent', 'Extent': 'extent',
# 'Extrema', # 'Extrema',
'FilledArea': 'filled_area', 'FilledArea': 'filled_area',
'FilledImage': 'filled_image', 'FilledImage': 'filled_image',
'HuMoments': 'moments_hu', 'HuMoments': 'moments_hu',
@@ -45,10 +45,10 @@ PROPS = {
'NormalizedMoments': 'moments_normalized', 'NormalizedMoments': 'moments_normalized',
'Orientation': 'orientation', 'Orientation': 'orientation',
'Perimeter': 'perimeter', 'Perimeter': 'perimeter',
# 'PixelIdxList', # 'PixelIdxList',
# 'PixelList', # 'PixelList',
'Solidity': 'solidity', 'Solidity': 'solidity',
# 'SubarrayIdx' # 'SubarrayIdx'
'WeightedCentralMoments': 'weighted_moments_central', 'WeightedCentralMoments': 'weighted_moments_central',
'WeightedCentroid': 'weighted_centroid', 'WeightedCentroid': 'weighted_centroid',
'WeightedHuMoments': 'weighted_moments_hu', 'WeightedHuMoments': 'weighted_moments_hu',
@@ -570,7 +570,7 @@ def perimeter(image, neighbourhood=4):
perimeter_weights[[13, 23]] = (1 + sqrt(2)) / 2 perimeter_weights[[13, 23]] = (1 + sqrt(2)) / 2
perimeter_image = ndimage.convolve(border_image, np.array([[10, 2, 10], perimeter_image = ndimage.convolve(border_image, np.array([[10, 2, 10],
[2, 1, 2], [ 2, 1, 2],
[10, 2, 10]]), [10, 2, 10]]),
mode='constant', cval=0) mode='constant', cval=0)