enumtypes.h   enumtypes.h 
skipping to change at line 60 skipping to change at line 60
GType vips_demand_style_get_type (void) G_GNUC_CONST; GType vips_demand_style_get_type (void) G_GNUC_CONST;
#define VIPS_TYPE_DEMAND_STYLE (vips_demand_style_get_type()) #define VIPS_TYPE_DEMAND_STYLE (vips_demand_style_get_type())
GType vips_image_type_get_type (void) G_GNUC_CONST; GType vips_image_type_get_type (void) G_GNUC_CONST;
#define VIPS_TYPE_IMAGE_TYPE (vips_image_type_get_type()) #define VIPS_TYPE_IMAGE_TYPE (vips_image_type_get_type())
GType vips_interpretation_get_type (void) G_GNUC_CONST; GType vips_interpretation_get_type (void) G_GNUC_CONST;
#define VIPS_TYPE_INTERPRETATION (vips_interpretation_get_type()) #define VIPS_TYPE_INTERPRETATION (vips_interpretation_get_type())
GType vips_band_format_get_type (void) G_GNUC_CONST; GType vips_band_format_get_type (void) G_GNUC_CONST;
#define VIPS_TYPE_BAND_FORMAT (vips_band_format_get_type()) #define VIPS_TYPE_BAND_FORMAT (vips_band_format_get_type())
GType vips_coding_get_type (void) G_GNUC_CONST; GType vips_coding_get_type (void) G_GNUC_CONST;
#define VIPS_TYPE_CODING (vips_coding_get_type()) #define VIPS_TYPE_CODING (vips_coding_get_type())
/* enumerations from "../../../libvips/include/vips/operation.h" */
GType vips_operation_flags_get_type (void) G_GNUC_CONST;
#define VIPS_TYPE_OPERATION_FLAGS (vips_operation_flags_get_type())
/* enumerations from "../../../libvips/include/vips/object.h" */ /* enumerations from "../../../libvips/include/vips/object.h" */
GType vips_argument_flags_get_type (void) G_GNUC_CONST; GType vips_argument_flags_get_type (void) G_GNUC_CONST;
#define VIPS_TYPE_ARGUMENT_FLAGS (vips_argument_flags_get_type()) #define VIPS_TYPE_ARGUMENT_FLAGS (vips_argument_flags_get_type())
G_END_DECLS G_END_DECLS
#endif /*VIPS_ENUM_TYPES_H*/ #endif /*VIPS_ENUM_TYPES_H*/
/* Generated data ends here */ /* Generated data ends here */
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 foreign.h   foreign.h 
skipping to change at line 139 skipping to change at line 139
/*< public >*/ /*< public >*/
/* The image we generate. This must be set by ->header(). /* The image we generate. This must be set by ->header().
*/ */
VipsImage *out; VipsImage *out;
/* The behind-the-scenes real image we decompress to. This can be a /* The behind-the-scenes real image we decompress to. This can be a
* disc foreign or a memory buffer. This must be set by ->load(). * disc foreign or a memory buffer. This must be set by ->load().
*/ */
VipsImage *real; VipsImage *real;
/* Set this to tag the operation as nocache.
*/
gboolean nocache;
} VipsForeignLoad; } VipsForeignLoad;
typedef struct _VipsForeignLoadClass { typedef struct _VipsForeignLoadClass {
VipsForeignClass parent_class; VipsForeignClass parent_class;
/*< public >*/ /*< public >*/
/* Is a file in this format. /* Is a file in this format.
* *
* This function should return %TRUE if the file contains an image o f * This function should return %TRUE if the file contains an image o f
* this type. If you don't define this function, #VipsForeignLoad * this type. If you don't define this function, #VipsForeignLoad
skipping to change at line 297 skipping to change at line 301
const char *vips_foreign_find_save( const char *filename ); const char *vips_foreign_find_save( const char *filename );
const char *vips_foreign_find_save_options( const char *filename ); const char *vips_foreign_find_save_options( const char *filename );
/* Read/write an image convenience functions. /* Read/write an image convenience functions.
*/ */
int vips_foreign_load( const char *filename, VipsImage **out, ... ) int vips_foreign_load( const char *filename, VipsImage **out, ... )
__attribute__((sentinel)); __attribute__((sentinel));
int vips_foreign_save( VipsImage *in, const char *filename, ... ) int vips_foreign_save( VipsImage *in, const char *filename, ... )
__attribute__((sentinel)); __attribute__((sentinel));
int vips_foreign_load_options( const char *filename, VipsImage **out ); int vips_foreign_load_options( const char *filename, VipsImage **out, ... )
int vips_foreign_save_options( VipsImage *in, const char *filename ); __attribute__((sentinel));
int vips_foreign_save_options( VipsImage *in, const char *filename, ... )
void vips_foreign_operation_init( void ); __attribute__((sentinel));
int vips_openslideload( const char *filename, VipsImage **out, ... ) int vips_openslideload( const char *filename, VipsImage **out, ... )
__attribute__((sentinel)); __attribute__((sentinel));
int vips_jpegload( const char *filename, VipsImage **out, ... ) int vips_jpegload( const char *filename, VipsImage **out, ... )
__attribute__((sentinel)); __attribute__((sentinel));
int vips_jpegload_buffer( void *buf, size_t len, VipsImage **out, ... ) int vips_jpegload_buffer( void *buf, size_t len, VipsImage **out, ... )
__attribute__((sentinel)); __attribute__((sentinel));
int vips_jpegsave( VipsImage *in, const char *filename, ... ) int vips_jpegsave( VipsImage *in, const char *filename, ... )
skipping to change at line 345 skipping to change at line 349
VIPS_FOREIGN_TIFF_COMPRESSION_DEFLATE, VIPS_FOREIGN_TIFF_COMPRESSION_DEFLATE,
VIPS_FOREIGN_TIFF_COMPRESSION_PACKBITS, VIPS_FOREIGN_TIFF_COMPRESSION_PACKBITS,
VIPS_FOREIGN_TIFF_COMPRESSION_CCITTFAX4, VIPS_FOREIGN_TIFF_COMPRESSION_CCITTFAX4,
VIPS_FOREIGN_TIFF_COMPRESSION_LZW, VIPS_FOREIGN_TIFF_COMPRESSION_LZW,
VIPS_FOREIGN_TIFF_COMPRESSION_LAST VIPS_FOREIGN_TIFF_COMPRESSION_LAST
} VipsForeignTiffCompression; } VipsForeignTiffCompression;
/** /**
* VipsForeignTiffPredictor: * VipsForeignTiffPredictor:
* @VIPS_FOREIGN_TIFF_PREDICTOR_NONE: no prediction * @VIPS_FOREIGN_TIFF_PREDICTOR_NONE: no prediction
* @VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL: horizontal differenceing * @VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL: horizontal differencing
* @VIPS_FOREIGN_TIFF_PREDICTOR_FLOAT: float predictor * @VIPS_FOREIGN_TIFF_PREDICTOR_FLOAT: float predictor
* *
* The predictor can help deflate and lzw compression. The values are fixed by * The predictor can help deflate and lzw compression. The values are fixed by
* the tiff library. * the tiff library.
*/ */
typedef enum { typedef enum {
VIPS_FOREIGN_TIFF_PREDICTOR_NONE = 1, VIPS_FOREIGN_TIFF_PREDICTOR_NONE = 1,
VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL = 2, VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL = 2,
VIPS_FOREIGN_TIFF_PREDICTOR_FLOAT = 3, VIPS_FOREIGN_TIFF_PREDICTOR_FLOAT = 3,
VIPS_FOREIGN_TIFF_PREDICTOR_LAST VIPS_FOREIGN_TIFF_PREDICTOR_LAST
 End of changes. 3 change blocks. 
5 lines changed or deleted 9 lines changed or added


 image.h   image.h 
skipping to change at line 422 skipping to change at line 422
* final write to jpeg. * final write to jpeg.
* Set *result to non-zero to indicate an error on write. * Set *result to non-zero to indicate an error on write.
*/ */
void (*written)( VipsImage *image, int *result ); void (*written)( VipsImage *image, int *result );
/* An image has been modified in some way and all caches /* An image has been modified in some way and all caches
* need dropping. * need dropping.
*/ */
void (*invalidate)( VipsImage *image ); void (*invalidate)( VipsImage *image );
/* Minimise this pipeline.
*
* This is triggered (sometimes) at the end of eval to signal that
* we're probably done and that operations involved should try to
* minimise memory use by, for example, dropping caches.
*
* See vips_tilecache().
*/
void (*minimise)( VipsImage *image );
} VipsImageClass; } VipsImageClass;
GType vips_image_get_type( void ); GType vips_image_get_type( void );
/* Has to be guint64 and not size_t/off_t since we have to be able to addre ss /* Has to be guint64 and not size_t/off_t since we have to be able to addre ss
* huge images on platforms with 32-bit files. * huge images on platforms with 32-bit files.
*/ */
extern const guint64 vips__image_sizeof_bandformat[]; extern const guint64 vips__image_sizeof_bandformat[];
/* Pixel address calculation macros. /* Pixel address calculation macros.
skipping to change at line 478 skipping to change at line 488
#define VIPS_IMAGE_ADDR( I, X, Y ) \ #define VIPS_IMAGE_ADDR( I, X, Y ) \
((I)->data + \ ((I)->data + \
(Y) * VIPS_IMAGE_SIZEOF_LINE( I ) + \ (Y) * VIPS_IMAGE_SIZEOF_LINE( I ) + \
(X) * VIPS_IMAGE_SIZEOF_PEL( I )) (X) * VIPS_IMAGE_SIZEOF_PEL( I ))
#endif /*VIPS_DEBUG*/ #endif /*VIPS_DEBUG*/
int vips_image_written( VipsImage *image ); int vips_image_written( VipsImage *image );
void vips_image_invalidate_all( VipsImage *image ); void vips_image_invalidate_all( VipsImage *image );
void vips_image_minimise_all( VipsImage *image );
void vips_image_preeval( VipsImage *image ); void vips_image_preeval( VipsImage *image );
void vips_image_eval( VipsImage *image, guint64 processed ); void vips_image_eval( VipsImage *image, guint64 processed );
void vips_image_posteval( VipsImage *image ); void vips_image_posteval( VipsImage *image );
void vips_image_set_progress( VipsImage *image, gboolean progress ); void vips_image_set_progress( VipsImage *image, gboolean progress );
gboolean vips_image_get_kill( VipsImage *image ); gboolean vips_image_get_kill( VipsImage *image );
void vips_image_set_kill( VipsImage *image, gboolean kill ); void vips_image_set_kill( VipsImage *image, gboolean kill );
VipsImage *vips_image_new( void ); VipsImage *vips_image_new( void );
VipsImage *vips_image_new_mode( const char *filename, const char *mode ); VipsImage *vips_image_new_mode( const char *filename, const char *mode );
 End of changes. 2 change blocks. 
0 lines changed or deleted 12 lines changed or added


 object.h   object.h 
skipping to change at line 544 skipping to change at line 544
gboolean vips_object_get_argument_needs_string( VipsObject *object, gboolean vips_object_get_argument_needs_string( VipsObject *object,
const char *name ); const char *name );
int vips_object_get_argument_to_string( VipsObject *object, int vips_object_get_argument_to_string( VipsObject *object,
const char *name, const char *arg ); const char *name, const char *arg );
int vips_object_set_required( VipsObject *object, const char *value ); int vips_object_set_required( VipsObject *object, const char *value );
typedef void *(*VipsObjectSetArguments)( VipsObject *, void *, void * ); typedef void *(*VipsObjectSetArguments)( VipsObject *, void *, void * );
VipsObject *vips_object_new( GType type, VipsObject *vips_object_new( GType type,
VipsObjectSetArguments set, void *a, void *b ); VipsObjectSetArguments set, void *a, void *b );
int vips_object_set_valist( VipsObject *object, va_list ap );
int vips_object_set( VipsObject *object, ... )
__attribute__((sentinel));
VipsObject *vips_object_new_from_string( VipsObjectClass *object_class, VipsObject *vips_object_new_from_string( VipsObjectClass *object_class,
const char *p ); const char *p );
void vips_object_to_string( VipsObject *object, VipsBuf *buf ); void vips_object_to_string( VipsObject *object, VipsBuf *buf );
void *vips_object_map( VipsSListMap2Fn fn, void *a, void *b ); void *vips_object_map( VipsSListMap2Fn fn, void *a, void *b );
typedef void *(*VipsTypeMapFn)( GType, void * ); typedef void *(*VipsTypeMapFn)( GType, void * );
typedef void *(*VipsTypeMap2Fn)( GType, void *, void * ); typedef void *(*VipsTypeMap2Fn)( GType, void *, void * );
typedef void *(*VipsClassMapFn)( VipsObjectClass *, void * ); typedef void *(*VipsClassMapFn)( VipsObjectClass *, void * );
void *vips_type_map( GType base, VipsTypeMap2Fn fn, void *a, void *b ); void *vips_type_map( GType base, VipsTypeMap2Fn fn, void *a, void *b );
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 operation.h   operation.h 
skipping to change at line 39 skipping to change at line 39
#ifndef VIPS_OPERATION_H #ifndef VIPS_OPERATION_H
#define VIPS_OPERATION_H #define VIPS_OPERATION_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /*__cplusplus*/ #endif /*__cplusplus*/
#include <vips/vips.h> #include <vips/vips.h>
/**
* VipsOperationFlags:
* @VIPS_OPERATION_NONE: no flags
* @VIPS_OPERATION_SEQUENTIAL: can work sequentially
* @VIPS_OPERATION_NOCACHE: must not be cached
*
* Flags we associate with an operation.
*
* @VIPS_OPERATION_SEQUENTIAL means that the operation works like vips_copy
:
* it can happily process images top-to-bottom with only small non-local
* references.
*
* @VIPS_OPERATION_NOCACHE means that the operation must not be cached by
* vips.
*/
typedef enum /*< flags >*/ {
VIPS_OPERATION_NONE = 0,
VIPS_OPERATION_SEQUENTIAL = 1,
VIPS_OPERATION_NOCACHE = 2
} VipsOperationFlags;
#define VIPS_TYPE_OPERATION (vips_operation_get_type()) #define VIPS_TYPE_OPERATION (vips_operation_get_type())
#define VIPS_OPERATION( obj ) \ #define VIPS_OPERATION( obj ) \
(G_TYPE_CHECK_INSTANCE_CAST( (obj), \ (G_TYPE_CHECK_INSTANCE_CAST( (obj), \
VIPS_TYPE_OPERATION, VipsOperation )) VIPS_TYPE_OPERATION, VipsOperation ))
#define VIPS_OPERATION_CLASS( klass ) \ #define VIPS_OPERATION_CLASS( klass ) \
(G_TYPE_CHECK_CLASS_CAST( (klass), \ (G_TYPE_CHECK_CLASS_CAST( (klass), \
VIPS_TYPE_OPERATION, VipsOperationClass )) VIPS_TYPE_OPERATION, VipsOperationClass ))
#define VIPS_IS_OPERATION( obj ) \ #define VIPS_IS_OPERATION( obj ) \
(G_TYPE_CHECK_INSTANCE_TYPE( (obj), VIPS_TYPE_OPERATION )) (G_TYPE_CHECK_INSTANCE_TYPE( (obj), VIPS_TYPE_OPERATION ))
#define VIPS_IS_OPERATION_CLASS( klass ) \ #define VIPS_IS_OPERATION_CLASS( klass ) \
skipping to change at line 69 skipping to change at line 90
/* When we added this operation to cache .. used to find LRU for /* When we added this operation to cache .. used to find LRU for
* flush. * flush.
*/ */
int time; int time;
/* Keep the hash here. /* Keep the hash here.
*/ */
guint hash; guint hash;
gboolean found_hash; gboolean found_hash;
/* Set this before the end of _build() to stop this operation from
* being cached. Some things, like sequential read from a TIFF file,
* can't be reused.
*/
gboolean nocache;
} VipsOperation; } VipsOperation;
typedef struct _VipsOperationClass { typedef struct _VipsOperationClass {
VipsObjectClass parent_class; VipsObjectClass parent_class;
/* Print the usage message. /* Print the usage message.
*/ */
void (*usage)( struct _VipsOperationClass *, VipsBuf * ); void (*usage)( struct _VipsOperationClass *, VipsBuf * );
/* Return a set of operation flags.
*/
VipsOperationFlags (*get_flags)( VipsOperation * );
VipsOperationFlags flags;
} VipsOperationClass; } VipsOperationClass;
GType vips_operation_get_type( void ); GType vips_operation_get_type( void );
VipsOperationFlags vips_operation_get_flags( VipsOperation *operation );
void vips_operation_class_print_usage( VipsOperationClass *operation_class ); void vips_operation_class_print_usage( VipsOperationClass *operation_class );
int vips_operation_call_valist( VipsOperation *operation, va_list ap ); int vips_operation_call_valist( VipsOperation *operation, va_list ap );
VipsOperation *vips_operation_new( const char *name ); VipsOperation *vips_operation_new( const char *name );
int vips_call( const char *operation_name, ... ); int vips_call( const char *operation_name, ... )
__attribute__((sentinel));
int vips_call_split( const char *operation_name, va_list optional, ... ); int vips_call_split( const char *operation_name, va_list optional, ... );
void vips_call_options( GOptionGroup *group, VipsOperation *operation ); void vips_call_options( GOptionGroup *group, VipsOperation *operation );
int vips_call_argv( VipsOperation *operation, int argc, char **argv ); int vips_call_argv( VipsOperation *operation, int argc, char **argv );
void vips_cache_drop_all( void ); void vips_cache_drop_all( void );
void vips_operation_set_nocache( VipsOperation *operation, gboolean nocache );
int vips_cache_operation_buildp( VipsOperation **operation ); int vips_cache_operation_buildp( VipsOperation **operation );
VipsOperation *vips_cache_operation_build( VipsOperation *operation ); VipsOperation *vips_cache_operation_build( VipsOperation *operation );
void vips_cache_print( void );
void vips_cache_set_max( int max ); void vips_cache_set_max( int max );
void vips_cache_set_max_mem( size_t max_mem ); void vips_cache_set_max_mem( size_t max_mem );
int vips_cache_get_max( void ); int vips_cache_get_max( void );
int vips_cache_get_size( void ); int vips_cache_get_size( void );
size_t vips_cache_get_max_mem( void ); size_t vips_cache_get_max_mem( void );
int vips_cache_get_max_files( void ); int vips_cache_get_max_files( void );
void vips_cache_set_max_files( int max_files ); void vips_cache_set_max_files( int max_files );
void vips_cache_set_dump( gboolean dump ); void vips_cache_set_dump( gboolean dump );
void vips_cache_set_trace( gboolean trace ); void vips_cache_set_trace( gboolean trace );
 End of changes. 7 change blocks. 
8 lines changed or deleted 31 lines changed or added


 resample.h   resample.h 
skipping to change at line 47 skipping to change at line 47
extern "C" { extern "C" {
#endif /*__cplusplus*/ #endif /*__cplusplus*/
int im_affinei( VipsImage *in, VipsImage *out, int im_affinei( VipsImage *in, VipsImage *out,
VipsInterpolate *interpolate, VipsInterpolate *interpolate,
double a, double b, double c, double d, double dx, double dy, double a, double b, double c, double d, double dx, double dy,
int ox, int oy, int ow, int oh ); int ox, int oy, int ow, int oh );
int im_affinei_all( VipsImage *in, VipsImage *out, VipsInterpolate *interpo late, int im_affinei_all( VipsImage *in, VipsImage *out, VipsInterpolate *interpo late,
double a, double b, double c, double d, double dx, double dy ) ; double a, double b, double c, double d, double dx, double dy ) ;
int im_shrink( VipsImage *in, VipsImage *out, double xshrink, double yshrin k );
int im_rightshift_size( VipsImage *in, VipsImage *out, int im_rightshift_size( VipsImage *in, VipsImage *out,
int xshift, int yshift, int band_fmt ); int xshift, int yshift, int band_fmt );
int im_match_linear( VipsImage *ref, VipsImage *sec, VipsImage *out, int im_match_linear( VipsImage *ref, VipsImage *sec, VipsImage *out,
int xr1, int yr1, int xs1, int ys1, int xr1, int yr1, int xs1, int ys1,
int xr2, int yr2, int xs2, int ys2 ); int xr2, int yr2, int xs2, int ys2 );
int im_match_linear_search( VipsImage *ref, VipsImage *sec, VipsImage *out, int im_match_linear_search( VipsImage *ref, VipsImage *sec, VipsImage *out,
int xr1, int yr1, int xs1, int ys1, int xr1, int yr1, int xs1, int ys1,
int xr2, int yr2, int xs2, int ys2, int xr2, int yr2, int xs2, int ys2,
int hwindowsize, int hsearchsize ); int hwindowsize, int hsearchsize );
int vips_shrink( VipsImage *in, VipsImage **out,
double xshrink, double yshrink, ... )
__attribute__((sentinel));
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /*__cplusplus*/ #endif /*__cplusplus*/
#endif /*IM_RESAMPLE_H*/ #endif /*IM_RESAMPLE_H*/
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 util.h   util.h 
skipping to change at line 216 skipping to change at line 216
GValue *vips__gvalue_ref_string_new( const char *text ); GValue *vips__gvalue_ref_string_new( const char *text );
void vips__gslist_gvalue_free( GSList *list ); void vips__gslist_gvalue_free( GSList *list );
GSList *vips__gslist_gvalue_copy( const GSList *list ); GSList *vips__gslist_gvalue_copy( const GSList *list );
GSList *vips__gslist_gvalue_merge( GSList *a, const GSList *b ); GSList *vips__gslist_gvalue_merge( GSList *a, const GSList *b );
char *vips__gslist_gvalue_get( const GSList *list ); char *vips__gslist_gvalue_get( const GSList *list );
int vips__seek( int fd, gint64 pos ); int vips__seek( int fd, gint64 pos );
int vips__ftruncate( int fd, gint64 pos ); int vips__ftruncate( int fd, gint64 pos );
int vips_existsf( const char *name, ... ) int vips_existsf( const char *name, ... )
__attribute__((format(printf, 1, 2))); __attribute__((format(printf, 1, 2)));
int vips_mkdirf( const char *name, ... )
__attribute__((format(printf, 1, 2)));
FILE *vips_popenf( const char *fmt, const char *mode, ... ) FILE *vips_popenf( const char *fmt, const char *mode, ... )
__attribute__((format(printf, 1, 3))); __attribute__((format(printf, 1, 3)));
/** /**
* VipsToken: * VipsToken:
* @VIPS_TOKEN_LEFT: left bracket * @VIPS_TOKEN_LEFT: left bracket
* @VIPS_TOKEN_RIGHT: right bracket * @VIPS_TOKEN_RIGHT: right bracket
* @VIPS_TOKEN_STRING: string constant * @VIPS_TOKEN_STRING: string constant
* @VIPS_TOKEN_EQUALS: equals sign * @VIPS_TOKEN_EQUALS: equals sign
* @VIPS_TOKEN_COMMA: comma * @VIPS_TOKEN_COMMA: comma
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 version.h   version.h 
/* Macros for the header version. /* Macros for the header version.
*/ */
#ifndef VIPS_VERSION_H #ifndef VIPS_VERSION_H
#define VIPS_VERSION_H #define VIPS_VERSION_H
#define VIPS_VERSION "7.28.9" #define VIPS_VERSION "7.30.0"
#define VIPS_VERSION_STRING "7.28.9-Mon Jan 20 22:59:17 MSK 2014" #define VIPS_VERSION_STRING "7.30.0-Mon Jan 20 22:24:50 MSK 2014"
#define VIPS_MAJOR_VERSION (7) #define VIPS_MAJOR_VERSION (7)
#define VIPS_MINOR_VERSION (28) #define VIPS_MINOR_VERSION (30)
#define VIPS_MICRO_VERSION (9) #define VIPS_MICRO_VERSION (0)
/* Not really anything to do with versions, but this is a handy place to pu t /* Not really anything to do with versions, but this is a handy place to pu t
* it. * it.
*/ */
#define VIPS_EXEEXT "" #define VIPS_EXEEXT ""
#endif /*VIPS_VERSION_H*/ #endif /*VIPS_VERSION_H*/
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added


 vips7compat.h   vips7compat.h 
skipping to change at line 653 skipping to change at line 653
int im_blend( VipsImage *c, VipsImage *a, VipsImage *b, VipsImage *out ); int im_blend( VipsImage *c, VipsImage *a, VipsImage *b, VipsImage *out );
DOUBLEMASK *im_vips2mask( VipsImage *in, const char *filename ); DOUBLEMASK *im_vips2mask( VipsImage *in, const char *filename );
int im_mask2vips( DOUBLEMASK *in, VipsImage *out ); int im_mask2vips( DOUBLEMASK *in, VipsImage *out );
int im_bandmean( VipsImage *in, VipsImage *out ); int im_bandmean( VipsImage *in, VipsImage *out );
int im_recomb( VipsImage *in, VipsImage *out, DOUBLEMASK *recomb ); int im_recomb( VipsImage *in, VipsImage *out, DOUBLEMASK *recomb );
int im_argb2rgba( VipsImage *in, VipsImage *out ); int im_argb2rgba( VipsImage *in, VipsImage *out );
int im_shrink( VipsImage *in, VipsImage *out, double xshrink, double yshrin
k );
/* ruby-vips uses this /* ruby-vips uses this
*/ */
#define vips_class_map_concrete_all vips_class_map_all #define vips_class_map_concrete_all vips_class_map_all
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /*__cplusplus*/ #endif /*__cplusplus*/
#endif /*VIPS_VIPS7COMPAT_H*/ #endif /*VIPS_VIPS7COMPAT_H*/
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/