fix some back compat stuff

nip2 now passes the test suite
This commit is contained in:
John Cupitt 2011-03-23 22:19:49 +00:00
parent 933373a405
commit 9e62bf3b36
4 changed files with 7 additions and 4 deletions

View File

@ -83,8 +83,6 @@ int vips__open_image_read( const char *filename );
int vips_image_open_input( VipsImage *image ); int vips_image_open_input( VipsImage *image );
int vips_image_open_output( VipsImage *image ); int vips_image_open_output( VipsImage *image );
int vips__image_write_prepare( VipsImage *image );
int im_mapfile( VipsImage * ); int im_mapfile( VipsImage * );
int im_mapfilerw( VipsImage * ); int im_mapfilerw( VipsImage * );
int im_remapfilerw( VipsImage *image ); int im_remapfilerw( VipsImage *image );

View File

@ -159,6 +159,10 @@ typedef int (*VipsRegionFillFn)( struct _VipsRegion *, void * );
int vips_region_fill( struct _VipsRegion *reg, int vips_region_fill( struct _VipsRegion *reg,
VipsRect *r, VipsRegionFillFn fn, void *a ); VipsRect *r, VipsRegionFillFn fn, void *a );
/* The new name for im_setupout(), still used by some old code.
*/
int vips__image_write_prepare( struct _VipsImage *image );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /*__cplusplus*/ #endif /*__cplusplus*/

View File

@ -176,7 +176,7 @@ extern "C" {
type, xres, yres ) type, xres, yres )
#define im__open_image_file vips__open_image_read #define im__open_image_file vips__open_image_read
#define im_setupout( IM ) (0) #define im_setupout( I ) vips__image_write_prepare( I )
#define im_writeline( Y, IM, P ) vips_image_write_line( IM, Y, P ) #define im_writeline( Y, IM, P ) vips_image_write_line( IM, Y, P )
#define im_prepare vips_region_prepare #define im_prepare vips_region_prepare

View File

@ -1767,7 +1767,8 @@ vips_image_new_array( VipsImage *parent, VipsImage **images, int n )
} }
/* Get the image ready for writing. This can get called many /* Get the image ready for writing. This can get called many
* times. Used by im_generate() and vips_image_write_line(). * times. Used by im_generate() and vips_image_write_line(). vips7 compat can
* call this as im_setupout().
*/ */
int int
vips__image_write_prepare( VipsImage *image ) vips__image_write_prepare( VipsImage *image )