Modify param names and some comments.

This commit is contained in:
beaock
2020-05-08 11:11:10 +09:00
parent 774b8c1ab3
commit f46a184632

View File

@@ -5,12 +5,12 @@ from PIL import Image
@contextmanager @contextmanager
def open_django_file(fieldfile): def open_django_file(field_file):
fieldfile.open() field_file.open()
try: try:
yield fieldfile yield field_file
finally: finally:
fieldfile.close() field_file.close()
def scale_and_crop_iter(image, options): def scale_and_crop_iter(image, options):
@@ -19,9 +19,9 @@ def scale_and_crop_iter(image, options):
Resize, crop and/or change quality of image. Resize, crop and/or change quality of image.
:param image: Source image file :param image: Source image file
:param type: :class:`django.core.files.images.ImageFile :type image : :class:`django.core.files.images.ImageFile
:param`options: List of option dictionaries, See scale_and_crop_single :param options: List of option dictionaries, See scale_and_crop_single
argument names for available keys. argument names for available keys.
:type options: list of dict :type options: list of dict
""" """
@@ -39,7 +39,7 @@ def scale_and_crop_single(image, size, crop=False, upscale=False, quality=None):
Resize, crop and/or change quality of an image. Resize, crop and/or change quality of an image.
:param image: Source image file :param image: Source image file
:param type: :class:`PIL.Image` :type image: :class:`PIL.Image`
:param size: Size as width & height, zero as either means unrestricted :param size: Size as width & height, zero as either means unrestricted
:type size: tuple of two int :type size: tuple of two int
@@ -84,10 +84,10 @@ def scale_and_crop_single(image, size, crop=False, upscale=False, quality=None):
diff_y = int(source_y - min(source_y, target_y)) diff_y = int(source_y - min(source_y, target_y))
if diff_x or diff_y: if diff_x or diff_y:
# Center cropping (default). # Center cropping (default).
halfdiff_x, halfdiff_y = diff_x // 2, diff_y // 2 half_diff_x, half_diff_y = diff_x // 2, diff_y // 2
box = [halfdiff_x, halfdiff_y, box = [half_diff_x, half_diff_y,
min(source_x, int(target_x) + halfdiff_x), min(source_x, int(target_x) + half_diff_x),
min(source_y, int(target_y) + halfdiff_y)] min(source_y, int(target_y) + half_diff_y)]
# Finally, crop the image! # Finally, crop the image!
im = im.crop(box) im = im.crop(box)