Skip to content

remove imresize #662

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
nicain merged 2 commits into from
May 20, 2019
Merged

remove imresize #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31620d9
#660 remove unused imresize import
NileGraddis May 20, 2019
4b524ff
#660 switch from using imresize to using Image.resize
NileGraddis May 20, 2019
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
11 changes: 7 additions & 4 deletions allensdk/brain_observatory/stimulus_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import six
import numpy as np
import scipy.ndimage.interpolation as spndi
from scipy.misc import imresize
from PIL import Image
from allensdk.api.cache import memoize
import itertools

Expand Down Expand Up @@ -495,10 +495,13 @@ def lsn_image_to_screen(self, img, stimulus_type, origin='lower', background_col

# assert img.dtype == np.uint8

pixels_per_patch = LOCALLY_SPARSE_NOISE_PIXELS[stimulus_type]

full_image = np.full((self.n_pixels_r, self.n_pixels_c), background_color, dtype=np.uint8)
img_full_res = imresize(img, float(pixels_per_patch), interp='nearest')

pixels_per_patch = float(LOCALLY_SPARSE_NOISE_PIXELS[stimulus_type])
target_size = tuple( int(pixels_per_patch * dimsize) for dimsize in img.shape[::-1] )
img_full_res = np.array(Image.fromarray(img).resize(target_size, 0)) # 0 -> nearest neighbor interpolator

mr, mc = lsn_coordinate_to_monitor_coordinate((0, 0), (self.n_pixels_r, self.n_pixels_c), stimulus_type)
Mr, Mc = lsn_coordinate_to_monitor_coordinate(img.shape, (self.n_pixels_r, self.n_pixels_c), stimulus_type)
full_image[int(mr):int(Mr), int(mc):int(Mc)] = img_full_res
Expand Down Expand Up @@ -536,7 +539,7 @@ def natural_scene_image_to_screen(self, img, origin='lower', translation=(0,0)):

def natural_movie_image_to_screen(self, img, origin='lower', translation=(0,0)):

img = imresize(img, NATURAL_MOVIE_PIXELS)
img = np.array(Image.fromarray(img).resize(NATURAL_MOVIE_PIXELS[::-1], 2)).astype(np.uint8) # 2 -> bilinear interpolator

assert img.dtype == np.uint8

Expand Down
1 change: 0 additions & 1 deletion allensdk/core/reference_space.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import os
import csv

from scipy.misc import imresize
from scipy.ndimage.interpolation import zoom
import numpy as np
import nrrd
Expand Down