Code style update

This commit is contained in:
Marco De Donno 2016-07-06 01:32:16 +02:00
parent 4d51a410d8
commit 7d8fea012b
2 changed files with 18 additions and 18 deletions

View File

@ -179,24 +179,24 @@ def crop(image, border=0):
def scale(self, factor, resample=Image.NEAREST): def scale(self, factor, resample=Image.NEAREST):
""" """
Returns a rescaled image by a specific factor given in parameter. Returns a rescaled image by a specific factor given in parameter.
A factor greater than 1 expands the image, between 0 and 1 contracts the A factor greater than 1 expands the image, between 0 and 1 contracts the
image. image.
:param factor: The expansion factor, as a float. :param factor: The expansion factor, as a float.
:param resample: An optional resampling filter. Same values possible as :param resample: An optional resampling filter. Same values possible as
in the PIL.Image.resize function. in the PIL.Image.resize function.
:returns: An :py:class:`~PIL.Image.Image` object. :returns: An :py:class:`~PIL.Image.Image` object.
""" """
if factor == 1: if factor == 1:
return self._new(self.im) return self._new(self.im)
elif factor <= 0: elif factor <= 0:
raise ValueError("the factor must be greater than 0") raise ValueError("the factor must be greater than 0")
else: else:
size = (int(round(factor * self.width)), size = (int(round(factor * self.width)),
int(round(factor * self.height))) int(round(factor * self.height)))
return self.resize(size, resample) return self.resize(size, resample)
def deform(image, deformer, resample=Image.BILINEAR): def deform(image, deformer, resample=Image.BILINEAR):

View File

@ -80,7 +80,7 @@ class TestImageOps(PillowTestCase):
def test_scale(self): def test_scale(self):
# Test the scaling function # Test the scaling function
i = hopper("L").resize((50,50)) i = hopper("L").resize((50, 50))
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
ImageOps.scale(i,-1) ImageOps.scale(i,-1)