handle offset correctly in convsep
separable convolutions didn't handle offset correctly, thanks Nicolas
This commit is contained in:
parent
173afe2169
commit
fba3d000a3
@ -21,6 +21,7 @@
|
|||||||
- more VipsImage props
|
- more VipsImage props
|
||||||
- added vips_image_write(), old one becomes vips_image_write_to_file()
|
- added vips_image_write(), old one becomes vips_image_write_to_file()
|
||||||
- jpeg read/write copies over XMP data
|
- jpeg read/write copies over XMP data
|
||||||
|
- handle offset correctly in separable convolutions (thanks Nicolas)
|
||||||
|
|
||||||
12/9/11 started 7.26.4
|
12/9/11 started 7.26.4
|
||||||
- fallback vips_init()
|
- fallback vips_init()
|
||||||
|
2
TODO
2
TODO
@ -5,8 +5,6 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
- nicolas's convsep patch
|
|
||||||
|
|
||||||
- add nifti support
|
- add nifti support
|
||||||
|
|
||||||
http://niftilib.sourceforge.net/
|
http://niftilib.sourceforge.net/
|
||||||
|
@ -65,6 +65,8 @@
|
|||||||
* - add array tiling
|
* - add array tiling
|
||||||
* 9/5/11
|
* 9/5/11
|
||||||
* - argh typo in overflow estimation could cause errors
|
* - argh typo in overflow estimation could cause errors
|
||||||
|
* 15/10/11 Nicolas
|
||||||
|
* - handle offset correctly in seperable convolutions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1132,9 +1134,10 @@ im_convsep_raw( IMAGE *in, IMAGE *out, INTMASK *mask )
|
|||||||
|
|
||||||
rmask->xsize = mask->ysize;
|
rmask->xsize = mask->ysize;
|
||||||
rmask->ysize = mask->xsize;
|
rmask->ysize = mask->xsize;
|
||||||
|
rmask->offset = 0.;
|
||||||
|
|
||||||
if( im_conv_raw( in, t, mask ) ||
|
if( im_conv_raw( in, t, rmask ) ||
|
||||||
im_conv_raw( t, out, rmask ) )
|
im_conv_raw( t, out, mask ) )
|
||||||
return( -1 );
|
return( -1 );
|
||||||
|
|
||||||
return( 0 );
|
return( 0 );
|
||||||
|
@ -41,6 +41,8 @@
|
|||||||
* 29/10/10
|
* 29/10/10
|
||||||
* - get rid of im_convsep_f(), just call this twice, no longer worth
|
* - get rid of im_convsep_f(), just call this twice, no longer worth
|
||||||
* keeping two versions
|
* keeping two versions
|
||||||
|
* 15/10/11 Nicolas
|
||||||
|
* - handle offset correctly in seperable convolutions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -410,9 +412,10 @@ im_convsep_f_raw( IMAGE *in, IMAGE *out, DOUBLEMASK *mask )
|
|||||||
|
|
||||||
rmask->xsize = mask->ysize;
|
rmask->xsize = mask->ysize;
|
||||||
rmask->ysize = mask->xsize;
|
rmask->ysize = mask->xsize;
|
||||||
|
rmask->offset = 0.;
|
||||||
|
|
||||||
if( im_conv_f_raw( in, t, mask ) ||
|
if( im_conv_f_raw( in, t, rmask ) ||
|
||||||
im_conv_f_raw( t, out, rmask ) )
|
im_conv_f_raw( t, out, mask ) )
|
||||||
return( -1 );
|
return( -1 );
|
||||||
|
|
||||||
return( 0 );
|
return( 0 );
|
||||||
|
Loading…
Reference in New Issue
Block a user