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

oops 

argh
This commit is contained in:
John Cupitt 2011-03-23 18:28:48 +00:00
parent 0497fa0737
commit 933373a405
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libvips/include/vips/internal.h
View File

@ -79,6 +79,7 @@ typedef int (*im__fftproc_fn)( VipsImage *, VipsImage *, VipsImage * );
/* iofuncs
*/
int vips__open_image_read( const char *filename );
int vips_image_open_input( VipsImage *image );
int vips_image_open_output( VipsImage *image );

1
libvips/include/vips/vips7compat.h
View File

@ -175,6 +175,7 @@ extern "C" {
xsize, ysize, bands, bandfmt, coding, \
type, xres, yres )
#define im__open_image_file vips__open_image_read
#define im_setupout( IM ) (0)
#define im_writeline( Y, IM, P ) vips_image_write_line( IM, Y, P )

2
libvips/iofuncs/image.c
View File

@ -990,7 +990,7 @@ vips_image_build( VipsObject *object )
return( -1 );
}
if( (image->fd = im__open_image_file( filename )) == -1 )
if( (image->fd = vips__open_image_read( filename )) == -1 )
return( -1 );
image->dtype = VIPS_IMAGE_OPENIN;
image->dhint = VIPS_DEMAND_STYLE_THINSTRIP;

8
libvips/iofuncs/vips.c
View File

@ -124,8 +124,8 @@
/* Sort of open for read for image files. Shared with im_binfile().
*/
static int
vips_open_image_read( const char *filename )
int
vips__open_image_read( const char *filename )
{
int fd;
@ -137,7 +137,7 @@ vips_open_image_read( const char *filename )
/* Open read-write failed. Fall back to open read-only.
*/
if( (fd = open( filename, MODE_READONLY )) == -1 ) {
vips_error_system( errno, "vips_open_image_read",
vips_error_system( errno, "vips__open_image_read",
_( "unable to open \"%s\"" ), filename );
return( -1 );
}
@ -912,7 +912,7 @@ vips_image_open_input( VipsImage *image )
gint64 rsize;
image->dtype = VIPS_IMAGE_OPENIN;
if( (image->fd = vips_open_image_read( image->filename )) == -1 )
if( (image->fd = vips__open_image_read( image->filename )) == -1 )
return( -1 );
if( read( image->fd, header, IM_SIZEOF_HEADER ) != IM_SIZEOF_HEADER ||
im__read_header_bytes( image, header ) ) {