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

handle offset correctly in convsep

Browse Source 
separable convolutions didn't handle offset correctly, thanks Nicolas
This commit is contained in:
John Cupitt 2011-10-15 13:12:46 +01:00
parent 173afe2169
commit fba3d000a3
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -21,6 +21,7 @@
- more VipsImage props
- added vips_image_write(), old one becomes vips_image_write_to_file()
- jpeg read/write copies over XMP data
- handle offset correctly in separable convolutions (thanks Nicolas)
12/9/11 started 7.26.4
- fallback vips_init()

2
TODO
View File

@ -5,8 +5,6 @@
- nicolas's convsep patch
- add nifti support
http://niftilib.sourceforge.net/

7
libvips/convolution/im_conv.c
View File

@ -65,6 +65,8 @@
* - add array tiling
* 9/5/11
* - 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->ysize = mask->xsize;
rmask->offset = 0.;
if( im_conv_raw( in, t, mask ) ||
im_conv_raw( t, out, rmask ) )
if( im_conv_raw( in, t, rmask ) ||
im_conv_raw( t, out, mask ) )
return( -1 );
return( 0 );

7
libvips/convolution/im_conv_f.c
View File

@ -41,6 +41,8 @@
* 29/10/10
* - get rid of im_convsep_f(), just call this twice, no longer worth
* 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->ysize = mask->xsize;
rmask->offset = 0.;
if( im_conv_f_raw( in, t, mask ) ||
im_conv_f_raw( t, out, rmask ) )
if( im_conv_f_raw( in, t, rmask ) ||
im_conv_f_raw( t, out, mask ) )
return( -1 );
return( 0 );