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

still segving with labq

Browse Source
This commit is contained in:
John Cupitt 2012-12-19 14:50:01 +00:00
parent 7fb57a4ea7
commit 0951e2faa4
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TODO
View File

@ -1,6 +1,13 @@
- im_benchmarkn segvs, im_affine wraopper is dropping a reference too early?
- test affine labq processing
try
$ vips colourspace k2.jpg x.v
$ vips affine x.v x2.v "1 0 0 1.1"
Segmentation fault (core dumped)
oo labq problem?
- quadratic doesn't work for order 3

23
libvips/resample/affine.c
View File

@ -486,10 +486,10 @@ vips_affine_build( VipsObject *object )
if( affine->trn.b == 0.0 &&
affine->trn.c == 0.0 )
vips_demand_hint( resample->out,
VIPS_DEMAND_STYLE_FATSTRIP, resample->in, NULL );
VIPS_DEMAND_STYLE_FATSTRIP, in, NULL );
else
vips_demand_hint( resample->out,
VIPS_DEMAND_STYLE_SMALLTILE, resample->in, NULL );
VIPS_DEMAND_STYLE_SMALLTILE, in, NULL );
/* Generate!
*/
@ -498,17 +498,24 @@ vips_affine_build( VipsObject *object )
in, affine ) )
return( -1 );
/*
if( repack ) {
VipsImage *x;
if( vips_LabS2LabQ( resample->out, &x, NULL ) )
return( -1 );
VIPS_UNREF( resample->out );
resample->out = x;
}
*/
/* Finally: can now set Xoffset/Yoffset.
*/
resample->out->Xoffset = affine->trn.odx - affine->trn.oarea.left;
resample->out->Yoffset = affine->trn.ody - affine->trn.oarea.top;
if( repack ) {
if( vips_LabS2LabQ( resample->out, &t[2], NULL ) )
return( -1 );
resample->out = t[2];
}
return( 0 );
}