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

route all fopen() though util.c

Browse Source 
im__file_open_read() / _write() now have a text_mode flag, so we can use
them everywhere and get rid of the last fopen() calls.
This commit is contained in:
John Cupitt 2011-01-31 16:15:19 +00:00
parent 233cbf1f15
commit b9760f7a02
9 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libvips/format/.radiance.c.swp Normal file
View File

Binary file not shown.

2
libvips/format/im_jpeg2vips.c
View File

@ -700,7 +700,7 @@ jpeg2vips( const char *name, IMAGE *out, gboolean header_only )
/* Make input. /* Make input.
*/ */
if( !(fp = im__file_open_read( filename, NULL )) ) if( !(fp = im__file_open_read( filename, NULL, FALSE )) )
return( -1 ); return( -1 );
eman.fp = fp; eman.fp = fp;
jpeg_stdio_src( &cinfo, fp ); jpeg_stdio_src( &cinfo, fp );

2
libvips/format/im_png2vips.c
View File

@ -140,7 +140,7 @@ read_new( const char *name, IMAGE *out )
read->row_pointer = NULL; read->row_pointer = NULL;
read->data = NULL; read->data = NULL;
if( !(read->fp = im__file_open_read( name, NULL )) ) { if( !(read->fp = im__file_open_read( name, NULL, FALSE )) ) {
read_destroy( read ); read_destroy( read );
return( NULL ); return( NULL );
} }

9
libvips/format/im_ppm2vips.c
View File

@ -419,7 +419,7 @@ ppm2vips_header( const char *filename, IMAGE *out )
int ascii; int ascii;
int msb_first; int msb_first;
if( !(fp = im__file_open_read( filename, NULL )) ) if( !(fp = im__file_open_read( filename, NULL, FALSE )) )
return( -1 ); return( -1 );
if( read_header( fp, out, &bits, &ascii, &msb_first ) ) { if( read_header( fp, out, &bits, &ascii, &msb_first ) ) {
fclose( fp ); fclose( fp );
@ -442,7 +442,7 @@ isppmmmap( const char *filename )
int ascii; int ascii;
int msb_first; int msb_first;
if( !(fp = im__file_open_read( filename, NULL )) ) if( !(fp = im__file_open_read( filename, NULL, FALSE )) )
return( -1 ); return( -1 );
if( !(im = im_open( "temp", "p" )) ) { if( !(im = im_open( "temp", "p" )) ) {
@ -481,7 +481,10 @@ im_ppm2vips( const char *filename, IMAGE *out )
{ {
FILE *fp; FILE *fp;
if( !(fp = im__file_open_read( filename, NULL )) ) /* Note that we open in binary mode. If this is a binary PPM, we need
* to be able to mmap it.
*/
if( !(fp = im__file_open_read( filename, NULL, FALSE )) )
return( -1 ); return( -1 );
if( parse_ppm( fp, filename, out ) ) { if( parse_ppm( fp, filename, out ) ) {
fclose( fp ); fclose( fp );

2
libvips/format/im_vips2jpeg.c
View File

@ -755,7 +755,7 @@ im_vips2jpeg( IMAGE *in, const char *filename )
/* Make output. /* Make output.
*/ */
if( !(write->eman.fp = im__file_open_write( name )) ) { if( !(write->eman.fp = im__file_open_write( name, FALSE )) ) {
write_destroy( write ); write_destroy( write );
return( -1 ); return( -1 );
} }

2
libvips/format/im_vips2png.c
View File

@ -370,7 +370,7 @@ im_vips2png( IMAGE *in, const char *filename )
/* Make output. /* Make output.
*/ */
if( !(write->fp = im__file_open_write( name )) ) { if( !(write->fp = im__file_open_write( name, FALSE )) ) {
write_destroy( write ); write_destroy( write );
return( -1 ); return( -1 );
} }

2
libvips/format/im_vips2ppm.c
View File

@ -87,7 +87,7 @@ write_new( IMAGE *in, const char *name )
write->in = in; write->in = in;
write->name = im_strdup( NULL, name ); write->name = im_strdup( NULL, name );
write->fp = im__file_open_write( name ); write->fp = im__file_open_write( name, FALSE );
if( !write->name || !write->fp ) { if( !write->name || !write->fp ) {
write_destroy( write ); write_destroy( write );

6
libvips/format/radiance.c
View File

@ -779,7 +779,7 @@ israd( const char *filename )
printf( "israd: \"%s\"\n", filename ); printf( "israd: \"%s\"\n", filename );
#endif /*DEBUG*/ #endif /*DEBUG*/
if( !(fin = im__file_open_read( filename, NULL )) ) if( !(fin = im__file_open_read( filename, NULL, FALSE )) )
return( 0 ); return( 0 );
strcpy( format, PICFMT ); strcpy( format, PICFMT );
result = checkheader( fin, format, NULL ); result = checkheader( fin, format, NULL );
@ -825,7 +825,7 @@ read_new( const char *filename, IMAGE *out )
read->prims[3][1] = CIE_y_w; read->prims[3][1] = CIE_y_w;
read->buf = NULL; read->buf = NULL;
if( !(read->fin = im__file_open_read( filename, NULL )) ) { if( !(read->fin = im__file_open_read( filename, NULL, FALSE )) ) {
read_destroy( read ); read_destroy( read );
return( NULL ); return( NULL );
} }
@ -1052,7 +1052,7 @@ write_new( IMAGE *in, const char *filename )
write->in = in; write->in = in;
write->filename = im_strdup( NULL, filename ); write->filename = im_strdup( NULL, filename );
write->fout = im__file_open_write( filename ); write->fout = im__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++ )

2
libvips/mask/rw_mask.c
View File

@ -482,7 +482,7 @@ im_read_dmask( const char *filename )
int x, y, i, size; int x, y, i, size;
char buf[IM_MAX_LINE]; char buf[IM_MAX_LINE];
if( !(fp = im__file_open_read( filename, NULL )) ) if( !(fp = im__file_open_read( filename, NULL, TRUE )) )
return( NULL ); return( NULL );
if( read_header( fp, &xs, &ys, &sc, &off ) ) { if( read_header( fp, &xs, &ys, &sc, &off ) ) {