sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix im_shrink()

Browse Source
This commit is contained in:
John Cupitt 2012-02-10 13:17:19 +00:00
parent 313ddda174
commit 8b5b3288b4
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -1,7 +1,7 @@
- add a sequential mode to all readers
- we need to shrink a line at a time .. also, im_shrink() could be a bit
quicker
we can't do this neatly in the base load class until we move all loaders to
classes ... do an ad-hoc hack for now
- argh

30
libvips/resample/im_shrink.c
View File

@ -28,8 +28,8 @@
* 2/2/11
* - gtk-doc
* 10/2/12
* - faster, simpler
* - shrink in chunks to reduce peak memuse for large shrinks
* - simpler
*/
/*
@ -135,9 +135,12 @@ shrink_start( IMAGE *out, void *a, void *b )
TYPE *p = (TYPE *) in; \
TYPE *q = (TYPE *) out; \
\
for( b = 0; b < bands; b++ ) \
sum[b] = 0; \
\
for( y1 = 0; y1 < st->mh; y1++ ) { \
for( i = 0, x1 = 0; x1 < st->mw; x1++ ) \
for( b = 0; b < bands; b++, i++ ) \
for( i = 0, x1 = 0; x1 < st->mw; x1++ ) \
for( b = 0; b < bands; b++, i++ ) \
sum[b] += p[i]; \
\
p += ls; \
@ -154,9 +157,12 @@ shrink_start( IMAGE *out, void *a, void *b )
TYPE *p = (TYPE *) in; \
TYPE *q = (TYPE *) out; \
\
for( b = 0; b < bands; b++ ) \
sum[b] = 0.0; \
\
for( y1 = 0; y1 < st->mh; y1++ ) { \
for( i = 0, x1 = 0; x1 < st->mw; x1++ ) \
for( b = 0; b < bands; b++, i++ ) \
for( i = 0, x1 = 0; x1 < st->mw; x1++ ) \
for( b = 0; b < bands; b++, i++ ) \
sum[b] += p[i]; \
\
p += ls; \
@ -189,9 +195,6 @@ shrink_gen2( ShrinkInfo *st, SeqInfo *seq,
int iy = (top + y) * st->yshrink;
VipsPel *in = IM_REGION_ADDR( ir, ix, iy );
for( i = 0; i < sizeof_pixel; i++ )
seq->sum[i] = 0;
switch( st->in->BandFmt ) {
case IM_BANDFMT_UCHAR:
ISHRINK( unsigned char ); break;
@ -213,6 +216,8 @@ shrink_gen2( ShrinkInfo *st, SeqInfo *seq,
default:
g_assert( 0 );
}
out += sizeof_pixel;
}
}
}
@ -223,7 +228,6 @@ static int
shrink_gen( REGION *or, void *vseq, void *a, void *b )
{
SeqInfo *seq = (SeqInfo *) vseq;
IMAGE *in = (IMAGE *) a;
ShrinkInfo *st = (ShrinkInfo *) b;
REGION *ir = seq->ir;
Rect *r = &or->valid;
@ -242,10 +246,10 @@ shrink_gen( REGION *or, void *vseq, void *a, void *b )
for( y = 0; y < r->height; y += ystep )
for( x = 0; x < r->width; x += xstep ) {
/* Clip the this rect against the image size.
/* Clip the this rect against the demand size.
*/
int width = VIPS_MIN( xstep, in->Xsize - r->left - x );
int height = VIPS_MIN( ystep, in->Ysize - r->top - y );
int width = VIPS_MIN( xstep, r->width - x );
int height = VIPS_MIN( ystep, r->height - y );
Rect s;
@ -287,6 +291,8 @@ shrink( IMAGE *in, IMAGE *out, double xshrink, double yshrink )
*/
if( !(st = IM_NEW( out, ShrinkInfo )) )
return( -1 );
st->in = in;
st->out = out;
st->xshrink = xshrink;
st->yshrink = yshrink;
st->mw = ceil( xshrink );