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

Wrapped long lines according to pep8.

Browse Source
This commit is contained in:
Korijn van Golen
2015-06-16 09:57:49 +02:00
parent 605eac2e8c
commit 03b7d638a7
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/feature/_hoghistogram.pyx
+10 -5
View File
@@ -50,8 +50,10 @@ cdef float cell_hog(cnp.float64_t[:, :] magnitude,
or row_index + cell_row >= size_rows
or column_index + cell_column < 0
or column_index + cell_column >= size_columns
or orientation[row_index + cell_row, column_index + cell_column] >= orientation_start
or orientation[row_index + cell_row, column_index + cell_column] < orientation_end): continue
or orientation[row_index + cell_row, column_index + cell_column]
>= orientation_start
or orientation[row_index + cell_row, column_index + cell_column]
< orientation_end): continue
total += magnitude[row_index + cell_row, column_index + cell_column]
@@ -90,8 +92,10 @@ def hog_histograms(cnp.float64_t[:, :] gradient_columns,
The histogram to fill.
"""
cdef cnp.float64_t[:, :] magnitude = np.hypot(gradient_columns, gradient_rows)
cdef cnp.float64_t[:, :] orientation = np.arctan2(gradient_rows, gradient_columns) * (180 / np.pi) % 180
cdef cnp.float64_t[:, :] magnitude = np.hypot(gradient_columns,
gradient_rows)
cdef cnp.float64_t[:, :] orientation = \
np.arctan2(gradient_rows, gradient_columns) * (180 / np.pi) % 180
cdef int i, x, y, o, yi, xi, cy1, cy2, cx1, cx2
cdef float orientation_start, orientation_end
@@ -116,7 +120,8 @@ def hog_histograms(cnp.float64_t[:, :] gradient_columns,
while x < cx2:
orientation_histogram[yi, xi, i] = cell_hog(magnitude,
orientation, orientation_start, orientation_end, cell_columns, cell_rows, x, y, size_columns, size_rows)
orientation, orientation_start, orientation_end,
cell_columns, cell_rows, x, y, size_columns, size_rows)
xi += 1
x += cell_columns