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

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

This commit is contained in:
John Cupitt 2019-01-18 09:48:54 +00:00
parent f51a93515e c24e47e3a8
commit 00dfb70801
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libvips/colour/colour.c
View File

@ -255,21 +255,6 @@ vips_colour_gen( VipsRegion *or,
return( 0 );
}
static int
vips_colour_attach_profile( VipsImage *im, const char *filename )
{
char *data;
size_t data_length;
if( !(data = vips__file_read_name( filename, vips__icc_dir(),
&data_length )) )
return( -1 );
vips_image_set_blob( im, VIPS_META_ICC_NAME,
(VipsCallbackFn) g_free, data, data_length );
return( 0 );
}
static int
vips_colour_build( VipsObject *object )
{
@ -356,12 +341,9 @@ vips_colour_build( VipsObject *object )
out->BandFmt = colour->format;
out->Bands = colour->bands;
if( colour->profile_filename )
if( vips_colour_attach_profile( out,
colour->profile_filename ) ) {
g_object_unref( out );
return( -1 );
}
if( colour->profile_filename &&
vips__profile_set( out, colour->profile_filename ) )
return( -1 );
if( vips_image_generate( out,
vips_start_many, vips_colour_gen, vips_stop_many,