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

add tests for Image.new modes

Browse Source
This commit is contained in:
Alexander 2017-08-05 21:58:31 +03:00
parent ab92adf7c9
commit 6b50ba07fd
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Tests/test_image.py
View File

@ -7,6 +7,25 @@ import sys
class TestImage(PillowTestCase): class TestImage(PillowTestCase):
def test_image_modes_success(self):
for mode in [
'1', 'P', 'PA',
'L', 'LA', 'La',
'F', 'I', 'I;16', 'I;16L', 'I;16B', 'I;16N',
'RGB', 'RGBX', 'RGBA', 'RGBa',
'CMYK', 'YCbCr', 'LAB', 'HSV',
]:
Image.new(mode, (1, 1))
def test_image_modes_fail(self):
for mode in [
'', 'bad', 'very very long',
'BGR;15', 'BGR;16', 'BGR;24', 'BGR;32'
]:
with self.assertRaises(ValueError) as e:
Image.new(mode, (1, 1));
self.assertEqual(e.exception.message, 'unrecognized image mode')
def test_sanity(self): def test_sanity(self):
im = Image.new("L", (100, 100)) im = Image.new("L", (100, 100))

7
libImaging/Storage.c
View File

@ -205,7 +205,7 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size)
} else { } else {
free(im); free(im);
return (Imaging) ImagingError_ValueError("unrecognized mode"); return (Imaging) ImagingError_ValueError("unrecognized image mode");
} }
/* Setup image descriptor */ /* Setup image descriptor */
@ -387,16 +387,13 @@ ImagingNew(const char* mode, int xsize, int ysize)
int bytes; int bytes;
Imaging im; Imaging im;
if (strcmp(mode, "") == 0)
return (Imaging) ImagingError_ValueError("empty mode");
if (strlen(mode) == 1) { if (strlen(mode) == 1) {
if (mode[0] == 'F' || mode[0] == 'I') if (mode[0] == 'F' || mode[0] == 'I')
bytes = 4; bytes = 4;
else else
bytes = 1; bytes = 1;
} else } else
bytes = strlen(mode); /* close enough */ bytes = strlen(mode) || 1; /* close enough */
if (xsize < 0 || ysize < 0) { if (xsize < 0 || ysize < 0) {
return (Imaging) ImagingError_ValueError("bad image size"); return (Imaging) ImagingError_ValueError("bad image size");