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

Use file descriptor instead of chunks

Browse Source
This commit is contained in:
Mickael Bonfill 2017-07-28 15:58:17 -04:00 committed by Eric Soroos
parent c5565fc7f0
commit 4b755d43ec
4 changed files with 74 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST.in
View File

@ -21,6 +21,7 @@ prune docs/_static
# build/src control detritus
exclude .coveragerc
exclude codecov.yml
exclude .editorconfig
exclude .landscape.yaml
exclude .travis

6
decode.c
View File

@ -695,15 +695,11 @@ PyImaging_SgiRleDecoderNew(PyObject* self, PyObject* args)
if (get_unpacker(decoder, mode, rawmode) < 0)
return NULL;
decoder->pulls_fd = 1;
decoder->decode = ImagingSgiRleDecode;
decoder->cleanup = ImagingSgiRleDecodeCleanup;
decoder->state.ystep = ystep;
((SGISTATE*)decoder->state.context)->bpc = bpc;
((SGISTATE*)decoder->state.context)->rowno = 0;
((SGISTATE*)decoder->state.context)->channo = 0;
((SGISTATE*)decoder->state.context)->starttabidx = 0;
((SGISTATE*)decoder->state.context)->lengthtabidx = 0;
return (PyObject*) decoder;
}

23
libImaging/Sgi.h
View File

@ -4,28 +4,7 @@ typedef struct {
/* CONFIGURATION */
/* Number of bytes per pixel per channel */
/* Number of bytes per channel per pixel */
int bpc;
/* Number of UINT32 data in RLE tables */
int tablen;
/* Current row index */
int rowno;
/* Current channel index */
int channo;
/* Offsets table */
uint32_t* starttab;
/* Lengths table */
uint32_t* lengthtab;
/* Offsets table index */
int starttabidx;
/* Lengths table index */
int lengthtabidx;
} SGISTATE;

142
libImaging/SgiRleDecode.c
View File

@ -5,6 +5,7 @@
* decoder for Sgi RLE data.
*
* history:
* 2017-07-28 mb fixed for images larger than 64KB
* 2017-07-20 mb created
*
* Copyright (c) Mickael Bonfill 2017.
@ -28,7 +29,7 @@ static void read4B(uint32_t* dest, UINT8* buf)
*dest = (uint32_t)((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]);
}
static int expandrow(UINT8* dest, UINT8* src, int n)
static int expandrow(UINT8* dest, UINT8* src, int n, int z)
{
UINT8 pixel, count;
@ -42,14 +43,16 @@ static int expandrow(UINT8* dest, UINT8* src, int n)
return count;
if (pixel & RLE_COPY_FLAG) {
while(count--) {
*dest++ = *src++;
*dest = *src++;
dest += z;
}
}
else {
pixel = *src++;
while (count--) {
*dest++ = pixel;
*dest = pixel;
dest += z;
}
}
@ -57,13 +60,13 @@ static int expandrow(UINT8* dest, UINT8* src, int n)
return 0;
}
static int expandrow2(UINT16* dest, UINT16* src, int n)
static int expandrow2(UINT16* dest, UINT16* src, int n, int z)
{
UINT8 pixel, count;
for (;n > 0; n--)
{
pixel = ((UINT8*)src)[1];
pixel = ((UINT8*)src)[0];
++src;
if (n == 1 && pixel != 0)
return n;
@ -72,12 +75,14 @@ static int expandrow2(UINT16* dest, UINT16* src, int n)
return count;
if (pixel & RLE_COPY_FLAG) {
while(count--) {
*dest++ = *src++;
*dest = *src++;
dest += z;
}
}
else {
while (count--) {
*dest++ = *src;
*dest = *src;
dest += z;
}
++src;
}
@ -85,121 +90,76 @@ static int expandrow2(UINT16* dest, UINT16* src, int n)
return 0;
}
int
ImagingSgiRleDecode(Imaging im, ImagingCodecState state,
UINT8* buf, int bytes)
{
SGISTATE *context;
uint32_t *starttab, *lengthtab, rleoffset, rlelength;
int tablen, i, j, rowno, channo, bpc;
long bufsize;
UINT8 *ptr;
uint32_t rleoffset, rlelength;
SGISTATE *context;
context = (SGISTATE*)state->context;
// oldcount = context->bytescount;
_imaging_seek_pyFd(state->fd, 0L, SEEK_END);
bufsize = _imaging_tell_pyFd(state->fd);
bufsize -= SGI_HEADER_SIZE;
ptr = malloc(sizeof(UINT8) * bufsize);
state->count = 0;
_imaging_seek_pyFd(state->fd, SGI_HEADER_SIZE, SEEK_SET);
_imaging_read_pyFd(state->fd, ptr, bufsize);
ptr = buf;
switch (state->state)
{
case 0:
/* decoder initialization */
state->y = 0;
if (state->ystep < 0)
state->y = im->ysize - 1;
else
state->ystep = 1;
context->tablen = im->ysize * im->bands;
context->starttab = calloc(context->tablen, sizeof(uint32_t));
context->lengthtab = calloc(context->tablen, sizeof(uint32_t));
tablen = im->bands * im->ysize;
starttab = calloc(tablen, sizeof(uint32_t));
lengthtab = calloc(tablen, sizeof(uint32_t));
state->state++;
break;
case 1:
/* read offsets table */
for (; context->starttabidx < context->tablen;
context->starttabidx++, ptr+=4, bytes-=4) {
for (i = 0, j = 0; i < tablen; i++, j+=4)
read4B(&starttab[i], &ptr[j]);
for (i = 0, j = tablen * sizeof(uint32_t); i < tablen; i++, j+=4)
read4B(&lengthtab[i], &ptr[j]);
/* check overflow */
if (bytes < 4)
return ptr - buf;
state->count += tablen * sizeof(uint32_t) * 2;
read4B(&context->starttab[context->starttabidx], ptr);
}
state->state++;
break;
case 2:
/* read lengths table */
for (; context->lengthtabidx < context->tablen;
context->lengthtabidx++, ptr+=4, bytes-=4) {
/* check overflow */
if (bytes < 4)
return ptr - buf;
read4B(&context->lengthtab[context->lengthtabidx], ptr);
}
state->state++;
break;
case 3:
/* rows decompression */
for (; context->rowno < im->ysize * im->bands;
context->rowno++, state->y += state->ystep )
for (rowno = 0; rowno < im->ysize; rowno++, state->y += state->ystep)
{
context->channo = (int)(context->rowno / im->ysize);
rleoffset = context->starttab[context->rowno];
for (channo = 0; channo < im->bands; channo++)
{
rleoffset = starttab[rowno + channo * im->ysize];
rlelength = lengthtab[rowno + channo * im->ysize];
rleoffset -= SGI_HEADER_SIZE;
rlelength = context->lengthtab[context->rowno];
/* check overflow */
if (rlelength > bytes)
return ptr - buf;
if (context->bpc ==1) {
if(expandrow(state->buffer, ptr, rlelength)) {
/* err: compressed row doesn't finish with 0 */
state->errcode = IMAGING_CODEC_OVERRUN;
return ptr - buf;
}
if(expandrow(&state->buffer[channo], &ptr[rleoffset], rlelength, im->bands))
goto sgi_finish_decode;
}
else {
if(expandrow2((UINT16*)state->buffer, (UINT16*)ptr, rlelength)) {
/* err: compressed row doesn't finish with 0 */
state->errcode = IMAGING_CODEC_OVERRUN;
return ptr - buf;
}
if(expandrow2((UINT16*)&state->buffer[channo], (UINT16*)&ptr[rleoffset], rlelength, im->bands))
goto sgi_finish_decode;
}
/* reset index */
if (state->y == -1)
state->y = im->ysize - 1;
if (state->y == im->ysize)
state->y = 0;
/* set image data */
for (state->x = context->channo; state->x < im->xsize * im->pixelsize; state->x+=im->pixelsize)
((UINT8*)im->image[state->y])[state->x] = *state->buffer++;
state->buffer -= im->xsize;
bytes -= rlelength;
ptr += rlelength;
}
return -1; /* no error */
default:
break;
state->count += rlelength;
}
return ptr - buf;
state->shuffle((UINT8*)im->image[state->y], state->buffer, im->xsize);
}
int ImagingSgiRleDecodeCleanup(ImagingCodecState state) {
bufsize++;
// SGISTATE *context;
// context = (SGISTATE*)state->context;
sgi_finish_decode:
// free(context->starttab);
// free(context->lengthtab);
// // free(context);
free(starttab);
free(lengthtab);
free(ptr);
return -1;
return state->count - bufsize;
}