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

fix a c++ warning 

see https://github.com/jcupitt/libvips/pull/864
This commit is contained in:
John Cupitt 2018-01-26 07:56:43 +00:00
parent 94daa18884
commit 97a4ed2ca9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
- vips_sink_screen() keeps a ref to the input image ... stops a rare race
- fix a minor accidental ABI break in 8.6.0 -> 8.6.1 [remicollet]
- fix read of plane-separate TIFFs with large strips [remicollet]
- fix a C++ warning in composite.cpp [lovell]
10/12/17 started 8.6.1
- fix mmap window new/free cycling

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;