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

Merge pull request #8 from ClinicalGraphics/fasthog

Browse Source 
Fasthog
This commit is contained in:
Tim Sheerman-Chase
2015-06-19 18:02:43 +01:00
parent 8d31edb773 cd30e010d5
commit 70a0ed58d5
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/feature/_hoghistogram.pyx
+22 -21
View File
@@ -10,7 +10,7 @@ cdef float cell_hog(double[:, ::1] magnitude,
float orientation_start, float orientation_end,
int cell_columns, int cell_rows,
int column_index, int row_index,
int size_columns, int size_rows):
int size_columns, int size_rows) nogil:
"""Calculation of the cell's HOG value
Parameters
@@ -116,26 +116,27 @@ def hog_histograms(double[:, ::1] gradient_columns,
cr = cell_columns * number_of_cells_columns
number_of_orientations_per_180 = 180. / number_of_orientations
# compute orientations integral images
for i in range(number_of_orientations):
# isolate orientations in this range
orientation_start = number_of_orientations_per_180 * (i + 1)
orientation_end = number_of_orientations_per_180 * i
x = x0
y = y0
yi = 0
xi = 0
while y < cc:
xi = 0
with nogil:
# compute orientations integral images
for i in range(number_of_orientations):
# isolate orientations in this range
orientation_start = number_of_orientations_per_180 * (i + 1)
orientation_end = number_of_orientations_per_180 * i
x = x0
y = y0
yi = 0
xi = 0
while x < cr:
orientation_histogram[yi, xi, i] = cell_hog(magnitude,
orientation, orientation_start, orientation_end,
cell_columns, cell_rows, x, y, size_columns, size_rows)
xi += 1
x += cell_columns
while y < cc:
xi = 0
x = x0
yi += 1
y += cell_rows
while x < cr:
orientation_histogram[yi, xi, i] = cell_hog(magnitude,
orientation, orientation_start, orientation_end,
cell_columns, cell_rows, x, y, size_columns, size_rows)
xi += 1
x += cell_columns
yi += 1
y += cell_rows