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

Merge pull request #2937 from radarhere/fixes

Browse Source 
Minor fixes
This commit is contained in:
Hugo 2018-01-06 20:25:23 +02:00 committed by GitHub
commit 05040292fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/PIL/IcnsImagePlugin.py
View File

@ -353,13 +353,18 @@ if sys.platform == 'darwin':
if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) < 2:
print("Syntax: python IcnsImagePlugin.py [file]")
sys.exit()
imf = IcnsImageFile(open(sys.argv[1], 'rb')) imf = IcnsImageFile(open(sys.argv[1], 'rb'))
for size in imf.info['sizes']: for size in imf.info['sizes']:
imf.size = size imf.size = size
imf.load() imf.load()
im = imf.im im = imf.im
im.save('out-%s-%s-%s.png' % size) im.save('out-%s-%s-%s.png' % size)
im = Image.open(open(sys.argv[1], "rb")) im = Image.open(sys.argv[1])
im.save("out.png") im.save("out.png")
if sys.platform == 'windows': if sys.platform == 'windows':
os.startfile("out.png") os.startfile("out.png")

6
src/PIL/ImageShow.py
View File

@ -186,5 +186,9 @@ else:
register(XVViewer) register(XVViewer)
if __name__ == "__main__": if __name__ == "__main__":
# usage: python ImageShow.py imagefile [title]
if len(sys.argv) < 2:
print("Syntax: python ImageShow.py imagefile [title]")
sys.exit()
print(show(Image.open(sys.argv[1]), *sys.argv[2:])) print(show(Image.open(sys.argv[1]), *sys.argv[2:]))

14
src/PIL/SpiderImagePlugin.py
View File

@ -48,9 +48,7 @@ def isInt(f):
return 1 return 1
else: else:
return 0 return 0
except ValueError: except (ValueError, OverflowError):
return 0
except OverflowError:
return 0 return 0
iforms = [1, 3, -11, -12, -21, -22] iforms = [1, 3, -11, -12, -21, -22]
@ -286,7 +284,7 @@ Image.register_save(SpiderImageFile.format, _save_spider)
if __name__ == "__main__": if __name__ == "__main__":
if not sys.argv[1:]: if len(sys.argv) < 2:
print("Syntax: python SpiderImagePlugin.py [infile] [outfile]") print("Syntax: python SpiderImagePlugin.py [infile] [outfile]")
sys.exit() sys.exit()
@ -295,10 +293,6 @@ if __name__ == "__main__":
print("input image must be in Spider format") print("input image must be in Spider format")
sys.exit() sys.exit()
outfile = ""
if len(sys.argv[1:]) > 1:
outfile = sys.argv[2]
im = Image.open(filename) im = Image.open(filename)
print("image: " + str(im)) print("image: " + str(im))
print("format: " + str(im.format)) print("format: " + str(im.format))
@ -307,7 +301,9 @@ if __name__ == "__main__":
print("max, min: ", end=' ') print("max, min: ", end=' ')
print(im.getextrema()) print(im.getextrema())
if outfile != "": if len(sys.argv) > 2:
outfile = sys.argv[2]
# perform some image operation # perform some image operation
im = im.transpose(Image.FLIP_LEFT_RIGHT) im = im.transpose(Image.FLIP_LEFT_RIGHT)
print( print(