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

change write_new to make it independent from file I/O

Browse Source
This commit is contained in:
Henri Chain 2016-05-20 11:28:33 +02:00
parent 4c599ea272
commit 14d7a97afc
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libvips/foreign/radiance.c
View File

@ -1176,7 +1176,7 @@ write_destroy( Write *write )
} }
static Write * static Write *
write_new( VipsImage *in, const char *filename ) write_new( VipsImage *in)
{ {
Write *write; Write *write;
int i; int i;
@ -1185,8 +1185,6 @@ write_new( VipsImage *in, const char *filename )
return( NULL ); return( NULL );
write->in = in; write->in = in;
write->filename = vips_strdup( NULL, filename );
write->fout = vips__file_open_write( filename, FALSE );
strcpy( write->format, COLRFMT ); strcpy( write->format, COLRFMT );
write->expos = 1.0; write->expos = 1.0;
for( i = 0; i < 3; i++ ) for( i = 0; i < 3; i++ )
@ -1201,11 +1199,6 @@ write_new( VipsImage *in, const char *filename )
write->prims[3][0] = CIE_x_w; write->prims[3][0] = CIE_x_w;
write->prims[3][1] = CIE_y_w; write->prims[3][1] = CIE_y_w;
if( !write->filename || !write->fout ) {
write_destroy( write );
return( NULL );
}
return( write ); return( write );
} }
@ -1292,9 +1285,14 @@ vips__rad_save( VipsImage *in, const char *filename )
if( vips_image_pio_input( in ) || if( vips_image_pio_input( in ) ||
vips_check_coding_rad( "vips2rad", in ) ) vips_check_coding_rad( "vips2rad", in ) )
return( -1 ); return( -1 );
if( !(write = write_new( in, filename )) ) if( !(write = write_new( in )) )
return( -1 ); return( -1 );
if( vips2rad_put_header( write ) ||
write->filename = vips_strdup( NULL, filename );
write->fout = vips__file_open_write( filename, FALSE );
if( !write->filename || !write->fout ||
vips2rad_put_header( write ) ||
vips2rad_put_data( write ) ) { vips2rad_put_data( write ) ) {
write_destroy( write ); write_destroy( write );
return( -1 ); return( -1 );