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

Also added a nogil context manager to hoghistograms

Browse Source
This commit is contained in:
Ivo Flipse
2015-06-19 16:01:52 +02:00
parent 691beaa59f
commit cd30e010d5
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/feature/_hoghistogram.pyx
+21 -20
View File
@@ -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