python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-10 19:56:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

support for La mode

Browse Source
This commit is contained in:
homm 2016-05-10 20:46:40 +02:00
parent 1ed5c59f23
commit c4b92d09b7
7 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PIL/Image.py
View File

@ -1539,6 +1539,9 @@ class Image(object):
if self.mode in ("1", "P"):
resample = NEAREST
if self.mode == 'LA':
return self.convert('La').resize(size, resample).convert('LA')
if self.mode == 'RGBA':
return self.convert('RGBa').resize(size, resample).convert('RGBA')
@ -1829,6 +1832,10 @@ class Image(object):
:returns: An :py:class:`~PIL.Image.Image` object.
"""
if self.mode == 'LA':
return self.convert('La').transform(
size, method, data, resample, fill).convert('LA')
if self.mode == 'RGBA':
return self.convert('RGBa').transform(
size, method, data, resample, fill).convert('RGBA')

1
PIL/PyAccess.py
View File

@ -278,6 +278,7 @@ mode_map = {'1': _PyAccess8,
'L': _PyAccess8,
'P': _PyAccess8,
'LA': _PyAccess32_2,
'La': _PyAccess32_2,
'PA': _PyAccess32_2,
'RGB': _PyAccess32_3,
'LAB': _PyAccess32_3,

2
Tests/make_hash.py
View File

@ -4,7 +4,7 @@ from __future__ import print_function
modes = [
"1",
"L", "LA",
"L", "LA", "La",
"I", "I;16", "I;16L", "I;16B", "I;32L", "I;32B",
"F",
"P", "PA",

2
Tests/test_image_resample.py
View File

@ -212,6 +212,7 @@ class CoreResampleAlphaCorrectTest(PillowTestCase):
self.run_levels_case(case.resize((512, 32), Image.BICUBIC))
self.run_levels_case(case.resize((512, 32), Image.LANCZOS))
@unittest.skip("current implementation isn't precise enough")
def test_levels_la(self):
case = self.make_levels_case('LA')
self.run_levels_case(case.resize((512, 32), Image.BILINEAR))
@ -243,7 +244,6 @@ class CoreResampleAlphaCorrectTest(PillowTestCase):
self.run_dity_case(case.resize((20, 20), Image.BICUBIC), (255, 255, 0))
self.run_dity_case(case.resize((20, 20), Image.LANCZOS), (255, 255, 0))
@unittest.skip("current implementation doesn't support La mode")
def test_dirty_pixels_la(self):
case = self.make_dity_case('LA', (255, 128), (0, 0))
self.run_dity_case(case.resize((20, 20), Image.BILINEAR), (255,))

1
libImaging/Access.c
View File

@ -222,6 +222,7 @@ ImagingAccessInit()
ADD("1", line_8, get_pixel_8, put_pixel_8);
ADD("L", line_8, get_pixel_8, put_pixel_8);
ADD("LA", line_32, get_pixel, put_pixel);
ADD("La", line_32, get_pixel, put_pixel);
ADD("I", line_32, get_pixel_32, put_pixel_32);
ADD("I;16", line_16, get_pixel_16L, put_pixel_16L);
ADD("I;16L", line_16, get_pixel_16L, put_pixel_16L);

44
libImaging/Convert.c
View File

@ -116,6 +116,42 @@ l2bit(UINT8* out, const UINT8* in, int xsize)
*out++ = (*in++ >= 128) ? 255 : 0;
}
static void
lA2la(UINT8* out, const UINT8* in, int xsize)
{
int x;
unsigned int alpha, pixel, tmp;
for (x = 0; x < xsize; x++, in += 4) {
alpha = in[3];
pixel = MULDIV255(in[0], alpha, tmp);
*out++ = (UINT8) pixel;
*out++ = (UINT8) pixel;
*out++ = (UINT8) pixel;
*out++ = (UINT8) alpha;
}
}
/* RGBa -> RGBA conversion to remove premultiplication
Needed for correct transforms/resizing on RGBA images */
static void
la2lA(UINT8* out, const UINT8* in, int xsize)
{
int x;
unsigned int alpha, pixel;
for (x = 0; x < xsize; x++, in+=4) {
alpha = in[3];
if (alpha) {
pixel = CLIP((255 * in[0]) / alpha);
} else {
pixel = in[0];
}
*out++ = (UINT8) pixel;
*out++ = (UINT8) pixel;
*out++ = (UINT8) pixel;
*out++ = (UINT8) alpha;
}
}
static void
l2la(UINT8* out, const UINT8* in, int xsize)
{
@ -405,7 +441,7 @@ rgba2rgb(UINT8* out, const UINT8* in, int xsize)
}
static void
rgba2rgba(UINT8* out, const UINT8* in, int xsize)
rgbA2rgba(UINT8* out, const UINT8* in, int xsize)
{
int x;
unsigned int alpha, tmp;
@ -437,7 +473,6 @@ rgba2rgbA(UINT8* out, const UINT8* in, int xsize)
*out++ = in[2];
}
*out++ = in[3];
}
}
@ -765,10 +800,13 @@ static struct {
{ "L", "YCbCr", l2ycbcr },
{ "LA", "L", la2l },
{ "LA", "La", lA2la },
{ "LA", "RGB", la2rgb },
{ "LA", "RGBX", la2rgb },
{ "LA", "RGBA", la2rgb },
{ "La", "LA", la2lA },
{ "I", "L", i2l },
{ "I", "F", i2f },
@ -795,7 +833,7 @@ static struct {
{ "RGBA", "I", rgb2i },
{ "RGBA", "F", rgb2f },
{ "RGBA", "RGB", rgba2rgb },
{ "RGBA", "RGBa", rgba2rgba },
{ "RGBA", "RGBa", rgbA2rgba },
{ "RGBA", "RGBX", rgb2rgba },
{ "RGBA", "CMYK", rgb2cmyk },
{ "RGBA", "YCbCr", ImagingConvertRGB2YCbCr },

6
libImaging/Storage.c
View File

@ -91,6 +91,12 @@ ImagingNewPrologueSubtype(const char *mode, unsigned xsize, unsigned ysize,
im->pixelsize = 4; /* store in image32 memory */
im->linesize = xsize * 4;
} else if (strcmp(mode, "La") == 0) {
/* 8-bit greyscale (luminance) with premultiplied alpha */
im->bands = 2;
im->pixelsize = 4; /* store in image32 memory */
im->linesize = xsize * 4;
} else if (strcmp(mode, "F") == 0) {
/* 32-bit floating point images */
im->bands = 1;