From 89d8fb33806b9b50138570f960a9d91142531426 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 25 Jan 2018 23:18:28 +0000 Subject: [PATCH] Silence 'missing sentinel' warnings in GCC v6+ --- libvips/conversion/composite.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvips/conversion/composite.cpp b/libvips/conversion/composite.cpp index 335a821b..870aa95b 100644 --- a/libvips/conversion/composite.cpp +++ b/libvips/conversion/composite.cpp @@ -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;