mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-02-03 05:04:24 +03:00
optimize memory usage
This commit is contained in:
homm
parent
e9fc720709
commit
c22af89ef0
11
_imaging.c
11
_imaging.c
|
|
@ -1612,8 +1612,7 @@ im_setmode(ImagingObject* self, PyObject* args)
|
|||
static PyObject*
|
||||
_stretch(ImagingObject* self, PyObject* args)
|
||||
{
|
||||
Imaging imIn;
|
||||
Imaging imOut;
|
||||
Imaging imIn, imOut;
|
||||
|
||||
int xsize, ysize;
|
||||
int filter = IMAGING_TRANSFORM_NEAREST;
|
||||
|
|
@ -1622,12 +1621,8 @@ _stretch(ImagingObject* self, PyObject* args)
|
|||
|
||||
imIn = self->image;
|
||||
|
||||
imOut = ImagingNew(imIn->mode, xsize, ysize);
|
||||
if ( ! imOut)
|
||||
return NULL;
|
||||
|
||||
if (!ImagingStretch(imOut, imIn, filter)) {
|
||||
ImagingDelete(imOut);
|
||||
imOut = ImagingStretch(imIn, xsize, ysize, filter);
|
||||
if ( ! imOut) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -91,12 +91,13 @@ static inline UINT8 clip8(float in)
|
|||
|
||||
|
||||
Imaging
|
||||
ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
|
||||
ImagingStretchHorizaontal(Imaging imIn, int xsize, int filter)
|
||||
{
|
||||
/* FIXME: this is a quick and straightforward translation from a
|
||||
python prototype. might need some further C-ification... */
|
||||
|
||||
ImagingSectionCookie cookie;
|
||||
Imaging imOut;
|
||||
struct filter *filterp;
|
||||
float support, scale, filterscale;
|
||||
float center, ww, ss;
|
||||
|
|
@ -104,15 +105,6 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
|
|||
int *xbounds;
|
||||
float *k, *kk;
|
||||
|
||||
/* check modes */
|
||||
if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
|
||||
return (Imaging) ImagingError_ModeError();
|
||||
|
||||
if (imOut->ysize != imIn->ysize)
|
||||
return (Imaging) ImagingError_ValueError(
|
||||
"ImagingStretchHorizaontal requires equal heights"
|
||||
);
|
||||
|
||||
/* check filter */
|
||||
switch (filter) {
|
||||
case IMAGING_TRANSFORM_NEAREST:
|
||||
|
|
@ -134,7 +126,7 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
|
|||
}
|
||||
|
||||
/* prepare for horizontal stretch */
|
||||
filterscale = scale = (float) imIn->xsize / imOut->xsize;
|
||||
filterscale = scale = (float) imIn->xsize / xsize;
|
||||
|
||||
/* determine support size (length of resampling filter) */
|
||||
support = filterp->support;
|
||||
|
|
@ -149,17 +141,17 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
|
|||
kmax = (int) ceil(support) * 2 + 1;
|
||||
|
||||
/* coefficient buffer (with rounding safety margin) */
|
||||
kk = malloc(imOut->xsize * kmax * sizeof(float));
|
||||
kk = malloc(xsize * kmax * sizeof(float));
|
||||
if ( ! kk)
|
||||
return (Imaging) ImagingError_MemoryError();
|
||||
|
||||
xbounds = malloc(imOut->xsize * 2 * sizeof(int));
|
||||
xbounds = malloc(xsize * 2 * sizeof(int));
|
||||
if ( ! xbounds) {
|
||||
free(kk);
|
||||
return (Imaging) ImagingError_MemoryError();
|
||||
}
|
||||
|
||||
for (xx = 0; xx < imOut->xsize; xx++) {
|
||||
for (xx = 0; xx < xsize; xx++) {
|
||||
k = &kk[xx * kmax];
|
||||
center = (xx + 0.5) * scale;
|
||||
ww = 0.0;
|
||||
|
|
@ -183,12 +175,19 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
|
|||
xbounds[xx * 2 + 1] = xmax;
|
||||
}
|
||||
|
||||
imOut = ImagingNew(imIn->mode, xsize, imIn->ysize);
|
||||
if ( ! imOut) {
|
||||
free(kk);
|
||||
free(xbounds);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ImagingSectionEnter(&cookie);
|
||||
/* horizontal stretch */
|
||||
for (yy = 0; yy < imOut->ysize; yy++) {
|
||||
if (imIn->image8) {
|
||||
/* 8-bit grayscale */
|
||||
for (xx = 0; xx < imOut->xsize; xx++) {
|
||||
for (xx = 0; xx < xsize; xx++) {
|
||||
xmin = xbounds[xx * 2 + 0];
|
||||
xmax = xbounds[xx * 2 + 1];
|
||||
k = &kk[xx * kmax];
|
||||
|
|
@ -201,7 +200,7 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
|
|||
switch(imIn->type) {
|
||||
case IMAGING_TYPE_UINT8:
|
||||
/* n-bit grayscale */
|
||||
for (xx = 0; xx < imOut->xsize; xx++) {
|
||||
for (xx = 0; xx < xsize; xx++) {
|
||||
xmin = xbounds[xx * 2 + 0];
|
||||
xmax = xbounds[xx * 2 + 1];
|
||||
k = &kk[xx * kmax];
|
||||
|
|
@ -217,7 +216,7 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
|
|||
break;
|
||||
case IMAGING_TYPE_INT32:
|
||||
/* 32-bit integer */
|
||||
for (xx = 0; xx < imOut->xsize; xx++) {
|
||||
for (xx = 0; xx < xsize; xx++) {
|
||||
xmin = xbounds[xx * 2 + 0];
|
||||
xmax = xbounds[xx * 2 + 1];
|
||||
k = &kk[xx * kmax];
|
||||
|
|
@ -229,7 +228,7 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
|
|||
break;
|
||||
case IMAGING_TYPE_FLOAT32:
|
||||
/* 32-bit float */
|
||||
for (xx = 0; xx < imOut->xsize; xx++) {
|
||||
for (xx = 0; xx < xsize; xx++) {
|
||||
xmin = xbounds[xx * 2 + 0];
|
||||
xmax = xbounds[xx * 2 + 1];
|
||||
k = &kk[xx * kmax];
|
||||
|
|
@ -254,60 +253,51 @@ ImagingStretchHorizaontal(Imaging imOut, Imaging imIn, int filter)
|
|||
|
||||
|
||||
Imaging
|
||||
ImagingStretch(Imaging imOut, Imaging imIn, int filter)
|
||||
ImagingTransposeToNew(Imaging imIn)
|
||||
{
|
||||
Imaging imTemp = ImagingNew(imIn->mode, imIn->ysize, imIn->xsize);
|
||||
if ( ! imTemp)
|
||||
return NULL;
|
||||
|
||||
if ( ! ImagingTranspose(imTemp, imIn)) {
|
||||
ImagingDelete(imTemp);
|
||||
return NULL;
|
||||
}
|
||||
return imTemp;
|
||||
}
|
||||
|
||||
|
||||
Imaging
|
||||
ImagingStretch(Imaging imIn, int xsize, int ysize, int filter)
|
||||
{
|
||||
Imaging imTemp1, imTemp2, imTemp3;
|
||||
int xsize = imOut->xsize;
|
||||
int ysize = imOut->ysize;
|
||||
Imaging imOut;
|
||||
|
||||
if (strcmp(imIn->mode, "P") == 0 || strcmp(imIn->mode, "1") == 0)
|
||||
return (Imaging) ImagingError_ModeError();
|
||||
|
||||
/* two-pass resize */
|
||||
imTemp1 = ImagingNew(imIn->mode, xsize, imIn->ysize);
|
||||
/* two-pass resize, first pass */
|
||||
imTemp1 = ImagingStretchHorizaontal(imIn, xsize, filter);
|
||||
if ( ! imTemp1)
|
||||
return NULL;
|
||||
|
||||
/* first pass */
|
||||
if ( ! ImagingStretchHorizaontal(imTemp1, imIn, filter)) {
|
||||
ImagingDelete(imTemp1);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
imTemp2 = ImagingNew(imIn->mode, imIn->ysize, xsize);
|
||||
if ( ! imTemp2) {
|
||||
ImagingDelete(imTemp1);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* transpose image once */
|
||||
if ( ! ImagingTranspose(imTemp2, imTemp1)) {
|
||||
imTemp2 = ImagingTransposeToNew(imTemp1);
|
||||
ImagingDelete(imTemp1);
|
||||
ImagingDelete(imTemp2);
|
||||
if ( ! imTemp2)
|
||||
return NULL;
|
||||
}
|
||||
ImagingDelete(imTemp1);
|
||||
|
||||
imTemp3 = ImagingNew(imIn->mode, ysize, xsize);
|
||||
if ( ! imTemp3) {
|
||||
ImagingDelete(imTemp2);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* second pass */
|
||||
if ( ! ImagingStretchHorizaontal(imTemp3, imTemp2, filter)) {
|
||||
imTemp3 = ImagingStretchHorizaontal(imTemp2, ysize, filter);
|
||||
ImagingDelete(imTemp2);
|
||||
ImagingDelete(imTemp3);
|
||||
if ( ! imTemp3)
|
||||
return NULL;
|
||||
}
|
||||
ImagingDelete(imTemp2);
|
||||
|
||||
/* transpose result */
|
||||
if ( ! ImagingTranspose(imOut, imTemp3)) {
|
||||
imOut = ImagingTransposeToNew(imTemp3);
|
||||
ImagingDelete(imTemp3);
|
||||
if ( ! imOut)
|
||||
return NULL;
|
||||
}
|
||||
ImagingDelete(imTemp3);
|
||||
|
||||
return imOut;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@ extern Imaging ImagingRotate(
|
|||
extern Imaging ImagingRotate90(Imaging imOut, Imaging imIn);
|
||||
extern Imaging ImagingRotate180(Imaging imOut, Imaging imIn);
|
||||
extern Imaging ImagingRotate270(Imaging imOut, Imaging imIn);
|
||||
extern Imaging ImagingStretch(Imaging imOut, Imaging imIn, int filter);
|
||||
extern Imaging ImagingStretch(Imaging imIn, int xsize, int ysize, int filter);
|
||||
extern Imaging ImagingTranspose(Imaging imOut, Imaging imIn);
|
||||
extern Imaging ImagingTransformPerspective(
|
||||
Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user