python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-09 16:10:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed variable names to avoid redefining builtins

Browse Source
This commit is contained in:
Andrew Murray 2016-05-10 22:31:36 +10:00
parent 6de51536c4
commit b1a528bf10
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PIL/TiffImagePlugin.py
View File

@ -1119,18 +1119,19 @@ class TiffImageFile(ImageFile.ImageFile):
if DEBUG: if DEBUG:
print("- size:", self.size) print("- size:", self.size)
format = self.tag_v2.get(SAMPLEFORMAT, (1,)) sampleFormat = self.tag_v2.get(SAMPLEFORMAT, (1,))
if len(format) > 1 and max(format) == min(format) == 1: if (len(sampleFormat) > 1
and max(sampleFormat) == min(sampleFormat) == 1):
# SAMPLEFORMAT is properly per band, so an RGB image will # SAMPLEFORMAT is properly per band, so an RGB image will
# be (1,1,1). But, we don't support per band pixel types, # be (1,1,1). But, we don't support per band pixel types,
# and anything more than one band is a uint8. So, just # and anything more than one band is a uint8. So, just
# take the first element. Revisit this if adding support # take the first element. Revisit this if adding support
# for more exotic images. # for more exotic images.
format = (1,) sampleFormat = (1,)
# mode: check photometric interpretation and bits per pixel # mode: check photometric interpretation and bits per pixel
key = ( key = (
self.tag_v2.prefix, photo, format, fillorder, self.tag_v2.prefix, photo, sampleFormat, fillorder,
self.tag_v2.get(BITSPERSAMPLE, (1,)), self.tag_v2.get(BITSPERSAMPLE, (1,)),
self.tag_v2.get(EXTRASAMPLES, ()) self.tag_v2.get(EXTRASAMPLES, ())
) )
@ -1215,7 +1216,7 @@ class TiffImageFile(ImageFile.ImageFile):
# https://github.com/python-pillow/Pillow/issues/279 # https://github.com/python-pillow/Pillow/issues/279
if fillorder == 2: if fillorder == 2:
key = ( key = (
self.tag_v2.prefix, photo, format, 1, self.tag_v2.prefix, photo, sampleFormat, 1,
self.tag_v2.get(BITSPERSAMPLE, (1,)), self.tag_v2.get(BITSPERSAMPLE, (1,)),
self.tag_v2.get(EXTRASAMPLES, ()) self.tag_v2.get(EXTRASAMPLES, ())
) )

4
Scripts/pildriver.py
View File

@ -208,9 +208,9 @@ class PILDriver(object):
Process the top image with the given filter. Process the top image with the given filter.
""" """
from PIL import ImageFilter from PIL import ImageFilter
filter = eval("ImageFilter." + self.do_pop().upper()) imageFilter = eval("ImageFilter." + self.do_pop().upper())
image = self.do_pop() image = self.do_pop()
self.push(image.filter(filter)) self.push(image.filter(imageFilter))
def do_getbbox(self): def do_getbbox(self):
"""usage: getbbox """usage: getbbox