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

Merge pull request #864 from lovell/missing-sentinel-composite

Browse Source 
composite.cpp: silence 'missing sentinel' warnings in GCC v6+
This commit is contained in:
John Cupitt 2018-01-26 07:37:17 +00:00 committed by GitHub
commit 2cd606bdb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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] ) ) { if( !vips_image_hasalpha( in[i] ) ) {
VipsImage *x; VipsImage *x;
if( vips_addalpha( in[i], &x, NULL ) ) if( vips_addalpha( in[i], &x, (void *) NULL ) )
return( -1 ); return( -1 );
g_object_unref( in[i] ); g_object_unref( in[i] );
in[i] = x; in[i] = x;
@ -1032,7 +1032,7 @@ vips_composite_base_build( VipsObject *object )
vips_object_local_array( object, composite->n ); vips_object_local_array( object, composite->n );
for( int i = 0; i < composite->n; i++ ) for( int i = 0; i < composite->n; i++ )
if( vips_colourspace( in[i], &compositing[i], if( vips_colourspace( in[i], &compositing[i],
composite->compositing_space, NULL ) ) composite->compositing_space, (void *) NULL ) )
return( -1 ); return( -1 );
in = compositing; in = compositing;