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

Use lcms profile where possible, otherwise skip test if sRGB profile is not available

Browse Source
This commit is contained in:
wiredfool 2014-09-24 21:25:42 -07:00
parent 476c255cee
commit af138af779
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Tests/test_imagecms.py
View File

@ -3,6 +3,7 @@ from helper import unittest, PillowTestCase, hopper, lena
from PIL import Image from PIL import Image
from io import BytesIO from io import BytesIO
import os
try: try:
from PIL import ImageCms from PIL import ImageCms
@ -13,8 +14,8 @@ except ImportError as v:
pass pass
SRGB = "Tests/icc/sRGB.icm" SRGB = "Tests/icc/sRGB_IEC61966-2-1_black_scaled.icc"
HAVE_PROFILE = os.path.exists(SRGB)
class TestImageCms(PillowTestCase): class TestImageCms(PillowTestCase):
@ -26,6 +27,10 @@ class TestImageCms(PillowTestCase):
except ImportError as v: except ImportError as v:
self.skipTest(v) self.skipTest(v)
def skip_missing(self):
if not HAVE_PROFILE:
self.skipTest("SRGB profile not available")
def test_sanity(self): def test_sanity(self):
# basic smoke test. # basic smoke test.
@ -38,6 +43,7 @@ class TestImageCms(PillowTestCase):
# internal version number # internal version number
self.assertRegexpMatches(ImageCms.core.littlecms_version, "\d+\.\d+$") self.assertRegexpMatches(ImageCms.core.littlecms_version, "\d+\.\d+$")
self.skip_missing()
i = ImageCms.profileToProfile(hopper(), SRGB, SRGB) i = ImageCms.profileToProfile(hopper(), SRGB, SRGB)
self.assert_image(i, "RGB", (128, 128)) self.assert_image(i, "RGB", (128, 128))
@ -70,38 +76,45 @@ class TestImageCms(PillowTestCase):
hopper().point(t) hopper().point(t)
def test_name(self): def test_name(self):
self.skip_missing()
# get profile information for file # get profile information for file
self.assertEqual( self.assertEqual(
ImageCms.getProfileName(SRGB).strip(), ImageCms.getProfileName(SRGB).strip(),
'IEC 61966-2.1 Default RGB colour space - sRGB') 'IEC 61966-2-1 Default RGB Colour Space - sRGB')
def test_info(self): def test_info(self):
self.skip_missing()
self.assertEqual( self.assertEqual(
ImageCms.getProfileInfo(SRGB).splitlines(), [ ImageCms.getProfileInfo(SRGB).splitlines(), [
'sRGB IEC61966-2.1', '', 'sRGB IEC61966-2-1 black scaled', '',
'Copyright (c) 1998 Hewlett-Packard Company', '']) 'Copyright International Color Consortium, 2009', ''])
def test_copyright(self): def test_copyright(self):
self.skip_missing()
self.assertEqual( self.assertEqual(
ImageCms.getProfileCopyright(SRGB).strip(), ImageCms.getProfileCopyright(SRGB).strip(),
'Copyright (c) 1998 Hewlett-Packard Company') 'Copyright International Color Consortium, 2009')
def test_manufacturer(self): def test_manufacturer(self):
self.skip_missing()
self.assertEqual( self.assertEqual(
ImageCms.getProfileManufacturer(SRGB).strip(), ImageCms.getProfileManufacturer(SRGB).strip(),
'IEC http://www.iec.ch') '')
def test_model(self): def test_model(self):
self.skip_missing()
self.assertEqual( self.assertEqual(
ImageCms.getProfileModel(SRGB).strip(), ImageCms.getProfileModel(SRGB).strip(),
'IEC 61966-2.1 Default RGB colour space - sRGB') 'IEC 61966-2-1 Default RGB Colour Space - sRGB')
def test_description(self): def test_description(self):
self.skip_missing()
self.assertEqual( self.assertEqual(
ImageCms.getProfileDescription(SRGB).strip(), ImageCms.getProfileDescription(SRGB).strip(),
'sRGB IEC61966-2.1') 'sRGB IEC61966-2-1 black scaled')
def test_intent(self): def test_intent(self):
self.skip_missing()
self.assertEqual(ImageCms.getDefaultIntent(SRGB), 0) self.assertEqual(ImageCms.getDefaultIntent(SRGB), 0)
self.assertEqual(ImageCms.isIntentSupported( self.assertEqual(ImageCms.isIntentSupported(
SRGB, ImageCms.INTENT_ABSOLUTE_COLORIMETRIC, SRGB, ImageCms.INTENT_ABSOLUTE_COLORIMETRIC,
@ -139,6 +152,7 @@ class TestImageCms(PillowTestCase):
self.assertRaises( self.assertRaises(
ImageCms.PyCMSError, ImageCms.PyCMSError,
lambda: ImageCms.getProfileName(None)) lambda: ImageCms.getProfileName(None))
self.skip_missing()
self.assertRaises( self.assertRaises(
ImageCms.PyCMSError, ImageCms.PyCMSError,
lambda: ImageCms.isIntentSupported(SRGB, None, None)) lambda: ImageCms.isIntentSupported(SRGB, None, None))
@ -153,9 +167,9 @@ class TestImageCms(PillowTestCase):
def test_simple_lab(self): def test_simple_lab(self):
i = Image.new('RGB', (10, 10), (128, 128, 128)) i = Image.new('RGB', (10, 10), (128, 128, 128))
psRGB = ImageCms.createProfile("sRGB")
pLab = ImageCms.createProfile("LAB") pLab = ImageCms.createProfile("LAB")
t = ImageCms.buildTransform(SRGB, pLab, "RGB", "LAB") t = ImageCms.buildTransform(psRGB, pLab, "RGB", "LAB")
i_lab = ImageCms.applyTransform(i, t) i_lab = ImageCms.applyTransform(i, t)
@ -174,8 +188,9 @@ class TestImageCms(PillowTestCase):
self.assertEqual(list(b), [128] * 100) self.assertEqual(list(b), [128] * 100)
def test_lab_color(self): def test_lab_color(self):
psRGB = ImageCms.createProfile("sRGB")
pLab = ImageCms.createProfile("LAB") pLab = ImageCms.createProfile("LAB")
t = ImageCms.buildTransform(SRGB, pLab, "RGB", "LAB") t = ImageCms.buildTransform(psRGB, pLab, "RGB", "LAB")
# Need to add a type mapping for some PIL type to TYPE_Lab_8 in # Need to add a type mapping for some PIL type to TYPE_Lab_8 in
# findLCMSType, and have that mapping work back to a PIL mode # findLCMSType, and have that mapping work back to a PIL mode
# (likely RGB). # (likely RGB).
@ -189,8 +204,9 @@ class TestImageCms(PillowTestCase):
self.assert_image_similar(i, target, 30) self.assert_image_similar(i, target, 30)
def test_lab_srgb(self): def test_lab_srgb(self):
psRGB = ImageCms.createProfile("sRGB")
pLab = ImageCms.createProfile("LAB") pLab = ImageCms.createProfile("LAB")
t = ImageCms.buildTransform(pLab, SRGB, "LAB", "RGB") t = ImageCms.buildTransform(pLab, psRGB, "LAB", "RGB")
img = Image.open('Tests/images/lena.Lab.tif') img = Image.open('Tests/images/lena.Lab.tif')
@ -206,10 +222,11 @@ class TestImageCms(PillowTestCase):
def test_lab_roundtrip(self): def test_lab_roundtrip(self):
# check to see if we're at least internally consistent. # check to see if we're at least internally consistent.
psRGB = ImageCms.createProfile("sRGB")
pLab = ImageCms.createProfile("LAB") pLab = ImageCms.createProfile("LAB")
t = ImageCms.buildTransform(SRGB, pLab, "RGB", "LAB") t = ImageCms.buildTransform(psRGB, pLab, "RGB", "LAB")
t2 = ImageCms.buildTransform(pLab, SRGB, "LAB", "RGB") t2 = ImageCms.buildTransform(pLab, psRGB, "LAB", "RGB")
i = ImageCms.applyTransform(hopper(), t) i = ImageCms.applyTransform(hopper(), t)