Skip to content

tuple concatenation error fix #3

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tuple concatenation error fix #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions gist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ def _im_resize_crop(img, size, method = 'bilinear'):
new_size = numpy.round((img.shape[0] * scaling, img.shape[1] * scaling)).astype(int)
# TODO imresize just work with integers and we loose some perscion here
img = scipy.misc.imresize(img, new_size, method, mode = 'F')
sr = numpy.floor((img.shape[0] - size[0]) / 2.)
sc = numpy.floor((img.shape[1] - size[1]) / 2.)
sr = numpy.floor((img.shape[0] - size[0]) / 2.).astype(numpy.int)
sc = numpy.floor((img.shape[1] - size[1]) / 2.).astype(numpy.int)

img = img[sr : sr + size[0], sc : sc + size[1]]
return img
Expand All @@ -253,8 +253,8 @@ def gist(image_path, orientations = (8,8,8,8), num_blocks = 4, fc_prefilt = 4,
img = _im_resize_crop(img, image_size, 'bilinear')
img = img - img.min()
img = 255. * img / img.max()

gabor = create_gabor(orientations, image_size + 2 * boundary_extension)
img_size_boundary_extension = (image_size[0]+2*boundary_extension,image_size[1]+2*boundary_extension)
gabor = create_gabor(orientations, img_size_boundary_extension)
output = prefilt(img, fc_prefilt)
gist = gist_gabor(output, gabor, num_blocks, boundary_extension)

Expand Down