python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-27 07:34:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge d4f28b5d97 into 2fa09fe0e0

Browse Source
This commit is contained in:
wiredfool 2017-09-22 14:57:22 +00:00 committed by GitHub
commit d68ff3efeb
13 changed files with 201 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PIL/ImImagePlugin.py
View File

@ -310,6 +310,7 @@ SAVE = {
"I;16": ("L 16", "I;16"),
"I;16L": ("L 16L", "I;16L"),
"I;16B": ("L 16B", "I;16B"),
"I;16S": ("L 16S", "I;16S"),
"F": ("L 32F", "F;32F"),
"RGB": ("RGB", "RGB;L"),
"RGBA": ("RGBA", "RGBA;L"),

2
PIL/Image.py
View File

@ -238,7 +238,7 @@ _MODEINFO = {
"LAB": ("RGB", "L", ("L", "A", "B")),
"HSV": ("RGB", "L", ("H", "S", "V")),
# Experimental modes include I;16, I;16L, I;16B, RGBa, BGR;15, and
# Experimental modes include I;16, I;16L, I;16B, I;16S, RGBa, BGR;15, and
# BGR;24. Use these modes only if you know exactly what you're
# doing...

1
PIL/ImageMode.py
View File

@ -50,6 +50,7 @@ def getmode(mode):
modes["I;16"] = ModeDescriptor("I;16", "I", "L", "L")
modes["I;16L"] = ModeDescriptor("I;16L", "I", "L", "L")
modes["I;16B"] = ModeDescriptor("I;16B", "I", "L", "L")
modes["I;16S"] = ModeDescriptor("I;16S", "I", "L", "L")
# set global mode cache atomically
_modes = modes
return _modes[mode]

45
PIL/PyAccess.py
View File

@ -187,6 +187,21 @@ class _PyAccessI16_N(PyAccess):
self.pixels[y][x] = min(color[0], 65535)
class _PyAccessI16_NS(PyAccess):
""" I;16S access, native bitendian without conversion """
def _post_init(self, *args, **kwargs):
self.pixels = ffi.cast('short **', self.image)
def get_pixel(self, x, y):
return self.pixels[y][x]
def set_pixel(self, x, y, color):
try:
self.pixels[y][x] = max(min(color, 2**15-1), -2**15)
except TypeError:
self.pixels[y][x] = max(min(color[0], 2**15-1), -2**15)
class _PyAccessI16_L(PyAccess):
""" I;16L access, with conversion """
def _post_init(self, *args, **kwargs):
@ -207,6 +222,34 @@ class _PyAccessI16_L(PyAccess):
pixel.r = color >> 8
class _PyAccessI16_LS(PyAccess):
""" Littleendian I;16S access, with conversion """
def _post_init(self, *args, **kwargs):
self.pixels = ffi.cast('struct Pixel_I16 **', self.image)
def reverse(self, i):
orig = ffi.new('short *', i)
chars = ffi.cast('unsigned char *', orig)
chars[0], chars[1], = chars[1], chars[0]
return ffi.cast('short *', chars)[0]
def get_pixel(self, x, y):
return self.reverse(self.pixels[y][x])
def set_pixel(self, x, y, color):
pixel = self.pixels[y][x]
try:
color = max(min(color, 2**15-1), -2**15)
except TypeError:
color = max(min(color[0], 2**15-1), -2**15)
mask = color < 0 and 0x80 or 0x00
pixel.l = color & 0xFF
pixel.r = (color >> 8) | mask
class _PyAccessI16_B(PyAccess):
""" I;16B access, with conversion """
def _post_init(self, *args, **kwargs):
@ -297,6 +340,7 @@ if sys.byteorder == 'little':
mode_map['I;16'] = _PyAccessI16_N
mode_map['I;16L'] = _PyAccessI16_N
mode_map['I;16B'] = _PyAccessI16_B
mode_map['I;16S'] = _PyAccessI16_NS
mode_map['I;32L'] = _PyAccessI32_N
mode_map['I;32B'] = _PyAccessI32_Swap
@ -304,6 +348,7 @@ else:
mode_map['I;16'] = _PyAccessI16_L
mode_map['I;16L'] = _PyAccessI16_L
mode_map['I;16B'] = _PyAccessI16_N
mode_map['I;16S'] = _PyAccessI16_LS
mode_map['I;32L'] = _PyAccessI32_Swap
mode_map['I;32B'] = _PyAccessI32_N

BIN
Tests/images/16bit.s.tif Normal file
View File

Binary file not shown.

5
Tests/test_file_tiff.py
View File

@ -198,6 +198,11 @@ class TestFileTiff(PillowTestCase):
self.assertEqual(b[0], b'\x01')
self.assertEqual(b[1], b'\xe0')
def test_16bit_s(self):
im = Image.open('Tests/images/16bit.s.tif')
im.load()
self.assertEqual(im.mode, 'I;16S')
def test_12bit_rawmode(self):
""" Are we generating the same interpretation
of the image as Imagemagick is? """

53
Tests/test_mode_i16.py
View File

@ -1,7 +1,13 @@
from helper import unittest, PillowTestCase, hopper
from PIL import Image
import struct
HAS_PYACCESS = False
try:
from PIL import PyAccess
HAS_PYACCESS = True
except: pass
class TestModeI16(PillowTestCase):
@ -79,6 +85,7 @@ class TestModeI16(PillowTestCase):
basic("I;16")
basic("I;16B")
basic("I;16L")
basic("I;16S")
basic("I")
@ -92,6 +99,7 @@ class TestModeI16(PillowTestCase):
self.assertEqual(tobytes("L"), b"\x01")
self.assertEqual(tobytes("I;16"), b"\x01\x00")
self.assertEqual(tobytes("I;16B"), b"\x00\x01")
self.assertEqual(tobytes("I;16S"), b"\x01\x00")
self.assertEqual(tobytes("I"), b"\x01\x00\x00\x00"[::order])
def test_convert(self):
@ -106,6 +114,51 @@ class TestModeI16(PillowTestCase):
self.verify(im.convert("I;16B").convert("L"))
self.verify(im.convert("I;16B").convert("I"))
self.verify(im.convert("I;16S"))
self.verify(im.convert("I;16S").convert("L"))
self.verify(im.convert("I;16S").convert("I"))
def _test_i16s(self, pixels, data, rawmode):
ct = len(pixels)
im = Image.frombytes('I;16S',
(ct,1),
data,
'raw',
rawmode)
self.assertEqual(im.tobytes('raw', rawmode), data)
def _test_access(im, pixels):
access = im.load()
if HAS_PYACCESS:
py_access = PyAccess.new(im, im.readonly)
for ix, val in enumerate(pixels):
self.assertEqual(access[(ix, 0)], val)
access[(ix,0)] = 0
access[(ix,0)] = val
self.assertEqual(access[(ix, 0)], val)
if HAS_PYACCESS:
self.assertEqual(py_access[(ix, 0)], val)
py_access[(ix,0)] = 0
py_access[(ix,0)] = val
self.assertEqual(py_access[(ix, 0)], val)
_test_access(im, pixels)
_test_access(im.convert('I'), pixels) # lossless
_test_access(im.convert('F'), pixels) # lossless
_test_access(im.convert('L'), (0,0,0,0,1,128,255,255)) #lossy
def test_i16s(self):
# LE, base Rawmode:
pixels = (-2**15, -2**7, -1, 0, 1, 128, 255, 2**15-1)
ct = len(pixels)
data = struct.pack("<%dh"%ct, *pixels)
self._test_i16s(pixels, data, 'I;16S')
data = struct.pack(">%dh"%ct, *pixels)
self._test_i16s(pixels, data, 'I;16BS')
if __name__ == '__main__':
unittest.main()

14
_imaging.c
View File

@ -440,10 +440,11 @@ static inline PyObject*
getpixel(Imaging im, ImagingAccess access, int x, int y)
{
union {
UINT8 b[4];
UINT16 h;
INT32 i;
FLOAT32 f;
UINT8 b[4];
UINT16 H;
INT16 h;
INT32 i;
FLOAT32 f;
} pixel;
if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) {
@ -471,8 +472,11 @@ getpixel(Imaging im, ImagingAccess access, int x, int y)
case IMAGING_TYPE_FLOAT32:
return PyFloat_FromDouble(pixel.f);
case IMAGING_TYPE_SPECIAL:
if (strncmp(im->mode, "I;16", 4) == 0)
if (strncmp(im->mode, "I;16S", 5) == 0) {
return PyInt_FromLong(pixel.h);
} else if (strncmp(im->mode, "I;16", 4) == 0) {
return PyInt_FromLong(pixel.H);
}
break;
}

1
libImaging/Access.c
View File

@ -227,6 +227,7 @@ ImagingAccessInit()
ADD("I;16", line_16, get_pixel_16L, put_pixel_16L);
ADD("I;16L", line_16, get_pixel_16L, put_pixel_16L);
ADD("I;16B", line_16, get_pixel_16B, put_pixel_16B);
ADD("I;16S", line_16, get_pixel_16L, put_pixel_16L);
ADD("I;32L", line_32, get_pixel_32L, put_pixel_32L);
ADD("I;32B", line_32, get_pixel_32B, put_pixel_32B);
ADD("F", line_32, get_pixel_32, put_pixel_32);

60
libImaging/Convert.c
View File

@ -49,7 +49,7 @@
#ifndef round
double round(double x) {
return floor(x+0.5);
return floor(x+0.5);
}
#endif
@ -694,6 +694,17 @@ I_I16B(UINT8* out, const UINT8* in_, int xsize)
}
}
static void
I_I16S(UINT8* out, const UINT8* in_, int xsize)
{
int x, v;
INT32* in = (INT32*) in_;
for (x = 0; x < xsize; x++, in++) {
v = CLIP16(*in);
*out++ = (UINT8) v;
*out++ = (UINT8) (v >> 8);
}
}
static void
I16L_I(UINT8* out_, const UINT8* in, int xsize)
@ -714,6 +725,15 @@ I16B_I(UINT8* out_, const UINT8* in, int xsize)
*out++ = in[1] + ((int) in[0] << 8);
}
static void
I16S_I(UINT8* out_, const UINT8* in, int xsize)
{
int x;
INT32* out = (INT32*) out_;
for (x = 0; x < xsize; x++, in += 2)
*out++ = (INT16)(in[0] + ((int) in[1] << 8));
}
static void
I16L_F(UINT8* out_, const UINT8* in, int xsize)
{
@ -733,6 +753,15 @@ I16B_F(UINT8* out_, const UINT8* in, int xsize)
*out++ = (FLOAT32) (in[1] + ((int) in[0] << 8));
}
static void
I16S_F(UINT8* out_, const UINT8* in, int xsize)
{
int x;
FLOAT32* out = (FLOAT32*) out_;
for (x = 0; x < xsize; x++, in += 2)
*out++ = (FLOAT32) (INT16) (in[0] + ((int) in[1] << 8));
}
static void
L_I16L(UINT8* out, const UINT8* in, int xsize)
{
@ -753,6 +782,16 @@ L_I16B(UINT8* out, const UINT8* in, int xsize)
}
}
static void
L_I16S(UINT8* out, const UINT8* in, int xsize)
{
int x;
for (x = 0; x < xsize; x++, in++) {
*out++ = *in;
*out++ = 0;
}
}
static void
I16L_L(UINT8* out, const UINT8* in, int xsize)
{
@ -775,6 +814,19 @@ I16B_L(UINT8* out, const UINT8* in, int xsize)
*out++ = in[1];
}
static void
I16S_L(UINT8* out, const UINT8* in, int xsize)
{
int x;
for (x = 0; x < xsize; x++, in += 2)
if (in[1] & 0x80)
*out++ = 0; /* Negative -> 0 */
else if (in[1] != 0)
*out++ = 255; /* Greater than 255 -> 255 */
else
*out++ = in[0];
}
static struct {
const char* from;
const char* to;
@ -873,9 +925,15 @@ static struct {
{ "L", "I;16B", L_I16B },
{ "I;16B", "L", I16B_L },
{ "I", "I;16S", I_I16S },
{ "I;16S", "I", I16S_I },
{ "L", "I;16S", L_I16S },
{ "I;16S", "L", I16S_L },
{ "I;16", "F", I16L_F },
{ "I;16L", "F", I16L_F },
{ "I;16B", "F", I16B_F },
{ "I;16S", "F", I16S_F },
{ NULL }
};

12
libImaging/Pack.c
View File

@ -402,6 +402,16 @@ packI16N_I16(UINT8* out, const UINT8* in, int pixels){
}
}
static void
packI16S_I16BS(UINT8* out, const UINT8* in, int pixels){
int i;
UINT8* tmp = (UINT8*) in;
for (i = 0; i < pixels; i++) {
C16S;
out += 2; tmp += 2;
}
}
static void
packI32S(UINT8* out, const UINT8* in, int pixels)
@ -614,6 +624,8 @@ static struct {
{"I;16", "I;16", 16, copy2},
{"I;16B", "I;16B", 16, copy2},
{"I;16L", "I;16L", 16, copy2},
{"I;16S", "I;16S", 16, copy2},
{"I;16S", "I;16BS", 16, packI16S_I16BS},
{"I;16", "I;16N", 16, packI16N_I16}, // LibTiff native->image endian.
{"I;16L", "I;16N", 16, packI16N_I16},
{"I;16B", "I;16N", 16, packI16N_I16B},

3
libImaging/Storage.c
View File

@ -116,7 +116,8 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size)
im->type = IMAGING_TYPE_INT32;
} else if (strcmp(mode, "I;16") == 0 || strcmp(mode, "I;16L") == 0 \
|| strcmp(mode, "I;16B") == 0 || strcmp(mode, "I;16N") == 0) {
|| strcmp(mode, "I;16B") == 0 || strcmp(mode, "I;16N") == 0 \
|| strcmp(mode, "I;16S") == 0) {
/* EXPERIMENTAL */
/* 16-bit raw integer images */
im->bands = 1;

12
libImaging/Unpack.c
View File

@ -966,6 +966,16 @@ unpackI16N_I16(UINT8* out, const UINT8* in, int pixels){
}
}
static void
unpackI16BS_I16S(UINT8* out, const UINT8* in, int pixels){
int i;
UINT8* tmp = (UINT8*) out;
for (i = 0; i < pixels; i++) {
C16S;
in += 2; tmp += 2;
}
}
static void
unpackI12_I16(UINT8* out, const UINT8* in, int pixels){
/* Fillorder 1/MSB -> LittleEndian, for 12bit integer greyscale tiffs.
@ -1406,6 +1416,8 @@ static struct {
{"I;16", "I;16", 16, copy2},
{"I;16B", "I;16B", 16, copy2},
{"I;16L", "I;16L", 16, copy2},
{"I;16S", "I;16S", 16, copy2},
{"I;16S", "I;16BS", 16, unpackI16BS_I16S},
{"I;16", "I;16N", 16, unpackI16N_I16}, // LibTiff native->image endian.
{"I;16L", "I;16N", 16, unpackI16N_I16}, // LibTiff native->image endian.