Skip to content

Use newer Pillow resampling filter constants. #27

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
lvonlanthen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use newer Pillow resampling filter constants. #27

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
13 changes: 6 additions & 7 deletions deepzoom/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,14 @@

NS_DEEPZOOM = "http://schemas.microsoft.com/deepzoom/2008"

DEFAULT_RESIZE_FILTER = PIL.Image.ANTIALIAS
DEFAULT_RESIZE_FILTER = PIL.Image.LANCZOS
DEFAULT_IMAGE_FORMAT = "jpg"

RESIZE_FILTERS = {
"cubic": PIL.Image.CUBIC,
"bilinear": PIL.Image.BILINEAR,
"bicubic": PIL.Image.BICUBIC,
"nearest": PIL.Image.NEAREST,
"antialias": PIL.Image.ANTIALIAS,
"lanczos": PIL.Image.LANCZOS,
}

IMAGE_FORMATS = {
Expand Down Expand Up @@ -309,14 +308,14 @@ def _append_image(self, path, i):
if w != e_w or h != e_h:
# Resize incorrect tile to correct size
source_image = source_image.resize(
(e_w, e_h), PIL.Image.ANTIALIAS
(e_w, e_h), DEFAULT_RESIZE_FILTER
)
# Store new dimensions
w, h = e_w, e_h
else:
w = int(math.ceil(w * 0.5))
h = int(math.ceil(h * 0.5))
source_image.thumbnail((w, h), PIL.Image.ANTIALIAS)
source_image.thumbnail((w, h), DEFAULT_RESIZE_FILTER)
column, row = self.get_position(i)
x = (column % images_per_tile) * level_size
y = (row % images_per_tile) * level_size
Expand Down Expand Up @@ -405,7 +404,7 @@ def get_image(self, level):
if self.descriptor.width == width and self.descriptor.height == height:
return self.image
if (self.resize_filter is None) or (self.resize_filter not in RESIZE_FILTERS):
return self.image.resize((width, height), PIL.Image.ANTIALIAS)
return self.image.resize((width, height), DEFAULT_RESIZE_FILTER)
return self.image.resize((width, height), RESIZE_FILTERS[self.resize_filter])

def tiles(self, level):
Expand Down Expand Up @@ -596,7 +595,7 @@ def main():
"--resize_filter",
dest="resize_filter",
default=DEFAULT_RESIZE_FILTER,
help="Type of filter for resizing (bicubic, nearest, bilinear, antialias (best). Default: antialias",
help="Type of filter for resizing (bicubic, nearest, bilinear, lanczos (best). Default: lanczos",
)

(options, args) = parser.parse_args()
Expand Down