python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-09-27 06:26:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 51fabf8bcf into 516957bfa6

Browse Source
This commit is contained in:
Roman Inflianskas 2014-09-19 15:23:54 +00:00
commit 9fccf19059
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Tests/helper.py
View File

@ -180,8 +180,9 @@ def tostring(im, format, **options):
return out.getvalue() return out.getvalue()
def hopper(mode="RGB", cache={}): def image(filename, mode="RGB", cache={}):
from PIL import Image from PIL import Image
from os import path
im = None im = None
# FIXME: Implement caching to reduce reading from disk but so an original # FIXME: Implement caching to reduce reading from disk but so an original
# copy is returned each time and the cached image isn't modified by tests # copy is returned each time and the cached image isn't modified by tests
@ -189,35 +190,23 @@ def hopper(mode="RGB", cache={}):
# im = cache.get(mode) # im = cache.get(mode)
if im is None: if im is None:
if mode == "RGB": if mode == "RGB":
im = Image.open("Tests/images/hopper.ppm") im = Image.open(path.join("Tests/images", filename))
elif mode == "F": elif mode == "F":
im = lena("L").convert(mode) im = image(filename, "L").convert(mode)
elif mode[:4] == "I;16": elif mode[:4] == "I;16":
im = lena("I").convert(mode) im = image(filename, "I").convert(mode)
else: else:
im = lena("RGB").convert(mode) im = image(filename, "RGB").convert(mode)
# cache[mode] = im # cache[mode] = im
return im return im
def hopper(mode="RGB", cache={}):
return image("hopper.ppm", mode, cache)
def lena(mode="RGB", cache={}): def lena(mode="RGB", cache={}):
from PIL import Image return image("lena.ppm", mode, cache)
im = None
# FIXME: Implement caching to reduce reading from disk but so an original
# copy is returned each time and the cached image isn't modified by tests
# (for fast, isolated, repeatable tests).
# im = cache.get(mode)
if im is None:
if mode == "RGB":
im = Image.open("Tests/images/lena.ppm")
elif mode == "F":
im = lena("L").convert(mode)
elif mode[:4] == "I;16":
im = lena("I").convert(mode)
else:
im = lena("RGB").convert(mode)
# cache[mode] = im
return im
def command_succeeds(cmd): def command_succeeds(cmd):