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

fix two small bugs 

VipsPool was not linking to the parent class correctly, ifthenelse had
tangled images.
This commit is contained in:
John Cupitt 2011-06-21 14:42:39 +01:00
parent 3126e5100d
commit 2cb45f698e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvips/iofuncs/pool.c
View File

@ -103,7 +103,7 @@
*/
G_DEFINE_TYPE( VipsPool, vips_pool, VIPS_TYPE_POOL );
G_DEFINE_TYPE( VipsPool, vips_pool, VIPS_TYPE_OBJECT );
static void
vips_pool_dispose( GObject *gobject )

4
libvips/relational/im_ifthenelse.c
View File

@ -227,7 +227,7 @@ im_ifthenelse( IMAGE *c, IMAGE *a, IMAGE *b, IMAGE *out )
t[4] = c;
if( im__sizealike_vec( t + 2, t + 5, 3 ) )
return( -1 );
c = t[5];
c = t[7];
/* If c is not uchar, do (!=0) to make a uchar image.
*/
@ -238,7 +238,7 @@ im_ifthenelse( IMAGE *c, IMAGE *a, IMAGE *b, IMAGE *out )
c = t[8];
}
if( ifthenelse( c, t[6], t[7], out ) )
if( ifthenelse( c, t[5], t[6], out ) )
return( -1 );
return( 0 );