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

Merge branch 'master' of github.com:jcupitt/libvips

This commit is contained in:
John Cupitt 2018-01-27 11:43:31 +00:00
parent e0fd75266c 2cd606bdb2
commit 43e2f2bf9a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvips/conversion/composite.cpp
View File

@ -980,7 +980,7 @@ vips_composite_base_build( VipsObject *object )
if( !vips_image_hasalpha( in[i] ) ) {
VipsImage *x;
if( vips_addalpha( in[i], &x, NULL ) )
if( vips_addalpha( in[i], &x, (void *) NULL ) )
return( -1 );
g_object_unref( in[i] );
in[i] = x;
@ -1032,7 +1032,7 @@ vips_composite_base_build( VipsObject *object )
vips_object_local_array( object, composite->n );
for( int i = 0; i < composite->n; i++ )
if( vips_colourspace( in[i], &compositing[i],
composite->compositing_space, NULL ) )
composite->compositing_space, (void *) NULL ) )
return( -1 );
in = compositing;