Skip to content

vision.py fixes #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavanky merged 4 commits into from
Dec 25, 2017
Merged

vision.py fixes #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fee1b11
fix af_sift call
tomerdmnt Nov 29, 2017
b524bb4
fix vision.gloh call
tomerdmnt Dec 24, 2017
b73d4ee
fix vision.orb call
tomerdmnt Dec 24, 2017
e0f1ef1
call af_release_features on features __del__
tomerdmnt Dec 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions arrayfire/features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ def __init__(self, num=0):
assert(isinstance(num, numbers.Number))
safe_call(backend.get().af_create_features(c_pointer(self.feat), c_dim_t(num)))

def __del__(self):
"""
Release features' memory
"""
if self.feat:
backend.get().af_release_features(self.feat)
self.feat = None

def num_features(self):
"""
Returns the number of features detected.
Expand Down
16 changes: 9 additions & 7 deletions arrayfire/vision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def orb(image, threshold=20.0, max_features=400, scale = 1.5, num_levels = 4, bl
"""
feat = Features()
desc = Array()
safe_call(backend.get().af_orb(c_pointer(feat.feat), c_pointer(desc.arr),
safe_call(backend.get().af_orb(c_pointer(feat.feat), c_pointer(desc.arr), image.arr,
c_float_t(threshold), c_uint_t(max_features),
c_float_t(scale), c_uint_t(num_levels), blur_image))
return feat, desc
Expand Down Expand Up @@ -345,9 +345,9 @@ def sift(image, num_layers=3, contrast_threshold=0.04, edge_threshold=10.0, init

feat = Features()
desc = Array()
safe_call(af_sift(c_pointer(feat), c_pointer(desc),
image.arr, num_layers, contrast_threshold, edge_threshold,
initial_sigma, double_input, intensity_scale, feature_ratio))
safe_call(backend.get().af_sift(c_pointer(feat.feat), c_pointer(desc.arr),
image.arr, num_layers, c_float_t(contrast_threshold), c_float_t(edge_threshold),
c_float_t(initial_sigma), double_input, c_float_t(intensity_scale), c_float_t(feature_ratio)))

return (feat, desc)

Expand Down Expand Up @@ -391,9 +391,11 @@ def gloh(image, num_layers=3, contrast_threshold=0.04, edge_threshold=10.0, init

feat = Features()
desc = Array()
safe_call(af_gloh(c_pointer(feat), c_pointer(desc),
image.arr, num_layers, contrast_threshold, edge_threshold,
initial_sigma, double_input, intensity_scale, feature_ratio))
safe_call(backend.get().af_gloh(c_pointer(feat.feat), c_pointer(desc.arr),
image.arr, num_layers, c_float_t(contrast_threshold),
c_float_t(edge_threshold), c_float_t(initial_sigma),
double_input, c_float_t(intensity_scale),
c_float_t(feature_ratio)))

return (feat, desc)

Expand Down