python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-13 02:36:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Using uint* for pixel access in mode I;16 and I;32, fixes #452

Browse Source
This commit is contained in:
wiredfool 2013-12-19 21:39:18 -08:00
parent 598d97daff
commit 77c36d6edc
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_imaging.c
View File

@ -463,14 +463,14 @@ getpixel(Imaging im, ImagingAccess access, int x, int y)
{ {
union { union {
UINT8 b[4]; UINT8 b[4];
INT16 h; UINT16 h;
INT32 i; UINT32 i;
FLOAT32 f; FLOAT32 f;
} pixel; } pixel;
if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) { if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) {
PyErr_SetString(PyExc_IndexError, outside_image); PyErr_SetString(PyExc_IndexError, outside_image);
return NULL; return NULL;
} }
access->get_pixel(im, x, y, &pixel); access->get_pixel(im, x, y, &pixel);

16
libImaging/Access.c
View File

@ -94,11 +94,11 @@ static void
get_pixel_16L(Imaging im, int x, int y, void* color) get_pixel_16L(Imaging im, int x, int y, void* color)
{ {
UINT8* in = (UINT8*) &im->image[y][x+x]; UINT8* in = (UINT8*) &im->image[y][x+x];
INT16* out = color; UINT16* out = color;
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
out[0] = in[0] + (in[1]<<8); out[0] = in[0] + (in[1]<<8);
#else #else
out[0] = *(INT16*) in; out[0] = *(UINT16*) in;
#endif #endif
} }
@ -106,9 +106,9 @@ static void
get_pixel_16B(Imaging im, int x, int y, void* color) get_pixel_16B(Imaging im, int x, int y, void* color)
{ {
UINT8* in = (UINT8*) &im->image[y][x+x]; UINT8* in = (UINT8*) &im->image[y][x+x];
INT16* out = color; UINT16* out = color;
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
out[0] = *(INT16*) in; out[0] = *(UINT16*) in;
#else #else
out[0] = in[1] + (in[0]<<8); out[0] = in[1] + (in[0]<<8);
#endif #endif
@ -125,11 +125,11 @@ static void
get_pixel_32L(Imaging im, int x, int y, void* color) get_pixel_32L(Imaging im, int x, int y, void* color)
{ {
UINT8* in = (UINT8*) &im->image[y][x*4]; UINT8* in = (UINT8*) &im->image[y][x*4];
INT32* out = color; UINT32* out = color;
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
out[0] = in[0] + (in[1]<<8) + (in[2]<<16) + (in[3]<<24); out[0] = in[0] + (in[1]<<8) + (in[2]<<16) + (in[3]<<24);
#else #else
out[0] = *(INT32*) in; out[0] = *(UINT32*) in;
#endif #endif
} }
@ -137,9 +137,9 @@ static void
get_pixel_32B(Imaging im, int x, int y, void* color) get_pixel_32B(Imaging im, int x, int y, void* color)
{ {
UINT8* in = (UINT8*) &im->image[y][x*4]; UINT8* in = (UINT8*) &im->image[y][x*4];
INT32* out = color; UINT32* out = color;
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
out[0] = *(INT32*) in; out[0] = *(UINT32*) in;
#else #else
out[0] = in[3] + (in[2]<<8) + (in[1]<<16) + (in[0]<<24); out[0] = in[3] + (in[2]<<8) + (in[1]<<16) + (in[0]<<24);
#endif #endif