generate.h   generate.h 
skipping to change at line 59 skipping to change at line 59
void *a, void *b ); void *a, void *b );
int vips_sink_tile( VipsImage *im, int vips_sink_tile( VipsImage *im,
int tile_width, int tile_height, int tile_width, int tile_height,
VipsStartFn start_fn, VipsGenerateFn generate_fn, VipsStopFn stop_fn , VipsStartFn start_fn, VipsGenerateFn generate_fn, VipsStopFn stop_fn ,
void *a, void *b ); void *a, void *b );
typedef void (*VipsSinkNotify)( VipsImage *im, VipsRect *rect, void *a ); typedef void (*VipsSinkNotify)( VipsImage *im, VipsRect *rect, void *a );
int vips_sink_screen( VipsImage *in, VipsImage *out, VipsImage *mask, int vips_sink_screen( VipsImage *in, VipsImage *out, VipsImage *mask,
int tile_width, int tile_height, int max_tiles, int tile_width, int tile_height, int max_tiles,
int priority, int priority,
VipsSinkNotify notify, void *a ); VipsSinkNotify notify_fn, void *a );
int vips_sink_memory( VipsImage *im ); int vips_sink_memory( VipsImage *im );
int vips_sink_memory2( VipsImage *image );
void *vips_start_one( VipsImage *out, void *a, void *b ); void *vips_start_one( VipsImage *out, void *a, void *b );
int vips_stop_one( void *seq, void *a, void *b ); int vips_stop_one( void *seq, void *a, void *b );
void *vips_start_many( VipsImage *out, void *a, void *b ); void *vips_start_many( VipsImage *out, void *a, void *b );
int vips_stop_many( void *seq, void *a, void *b ); int vips_stop_many( void *seq, void *a, void *b );
VipsImage **vips_allocate_input_array( VipsImage *out, ... ) VipsImage **vips_allocate_input_array( VipsImage *out, ... )
__attribute__((sentinel)); __attribute__((sentinel));
int vips_image_generate( VipsImage *im, int vips_image_generate( VipsImage *im,
VipsStartFn start_fn, VipsGenerateFn generate_fn, VipsStopFn stop_fn , VipsStartFn start_fn, VipsGenerateFn generate_fn, VipsStopFn stop_fn ,
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 threadpool.h   threadpool.h 
skipping to change at line 134 skipping to change at line 134
int vips_threadpool_run( VipsImage *im, int vips_threadpool_run( VipsImage *im,
VipsThreadStartFn start, VipsThreadStartFn start,
VipsThreadpoolAllocateFn allocate, VipsThreadpoolAllocateFn allocate,
VipsThreadpoolWorkFn work, VipsThreadpoolWorkFn work,
VipsThreadpoolProgressFn progress, VipsThreadpoolProgressFn progress,
void *a ); void *a );
void vips_get_tile_size( VipsImage *im, void vips_get_tile_size( VipsImage *im,
int *tile_width, int *tile_height, int *nlines ); int *tile_width, int *tile_height, int *nlines );
void vips__print_renders( void );
void vips_concurrency_set( int concurrency ); void vips_concurrency_set( int concurrency );
int vips_concurrency_get( void ); int vips_concurrency_get( void );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /*__cplusplus*/ #endif /*__cplusplus*/
#endif /*VIPS_THREADPOOL_H*/ #endif /*VIPS_THREADPOOL_H*/
 End of changes. 1 change blocks. 
2 lines changed or deleted 0 lines changed or added


 type.h   type.h 
skipping to change at line 94 skipping to change at line 94
* *
* n is always length / sizeof_type, we keep it as a member for * n is always length / sizeof_type, we keep it as a member for
* convenience. * convenience.
*/ */
GType type; GType type;
size_t sizeof_type; size_t sizeof_type;
} VipsArea; } VipsArea;
VipsArea *vips_area_copy( VipsArea *area ); VipsArea *vips_area_copy( VipsArea *area );
void vips_area_unref( VipsArea *area ); void vips_area_unref( VipsArea *area );
void vips__type_leak( void );
VipsArea *vips_area_new( VipsCallbackFn free_fn, void *data ); VipsArea *vips_area_new( VipsCallbackFn free_fn, void *data );
VipsArea *vips_area_new_blob( VipsCallbackFn free_fn, VipsArea *vips_area_new_blob( VipsCallbackFn free_fn,
void *data, size_t length ); void *data, size_t length );
VipsArea *vips_area_new_array( GType type, size_t sizeof_type, int n ); VipsArea *vips_area_new_array( GType type, size_t sizeof_type, int n );
VipsArea *vips_area_new_array_object( int n ); VipsArea *vips_area_new_array_object( int n );
void *vips_area_get_data( VipsArea *area, void *vips_area_get_data( VipsArea *area,
size_t *length, int *n, GType *type, size_t *sizeof_type ); size_t *length, int *n, GType *type, size_t *sizeof_type );
skipping to change at line 201 skipping to change at line 200
int *vips_value_get_array_int( const GValue *value, int *n ); int *vips_value_get_array_int( const GValue *value, int *n );
int vips_value_set_array_int( GValue *value, const int *array, int n ); int vips_value_set_array_int( GValue *value, const int *array, int n );
GObject **vips_value_get_array_object( const GValue *value, int *n ); GObject **vips_value_get_array_object( const GValue *value, int *n );
int vips_value_set_array_object( GValue *value, int n ); int vips_value_set_array_object( GValue *value, int n );
/* See also image.h, that has vips_value_get_array_image() and /* See also image.h, that has vips_value_get_array_image() and
* vips_value_set_array_image(). They need to be declared after VipsImage. * vips_value_set_array_image(). They need to be declared after VipsImage.
*/ */
void vips__meta_init_types( void );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /*__cplusplus*/ #endif /*__cplusplus*/
#endif /*VIPS_TYPE_H*/ #endif /*VIPS_TYPE_H*/
 End of changes. 2 change blocks. 
3 lines changed or deleted 0 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.40.5" #define VIPS_VERSION "7.40.6"
#define VIPS_VERSION_STRING "7.40.5-Tue Aug 12 00:02:12 MSK 2014" #define VIPS_VERSION_STRING "7.40.6-Fri Aug 22 00:42:21 MSK 2014"
#define VIPS_MAJOR_VERSION (7) #define VIPS_MAJOR_VERSION (7)
#define VIPS_MINOR_VERSION (40) #define VIPS_MINOR_VERSION (40)
#define VIPS_MICRO_VERSION (5) #define VIPS_MICRO_VERSION (6)
/* 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. 
3 lines changed or deleted 3 lines changed or added


 vips.h   vips.h 
skipping to change at line 164 skipping to change at line 164
#ifdef VIPS_ENABLE_DEPRECATED #ifdef VIPS_ENABLE_DEPRECATED
#include <vips/deprecated.h> #include <vips/deprecated.h>
#endif /*VIPS_ENABLE_DEPRECATED*/ #endif /*VIPS_ENABLE_DEPRECATED*/
#include <vips/almostdeprecated.h> #include <vips/almostdeprecated.h>
#include <vips/dispatch.h> #include <vips/dispatch.h>
/* We can't use _ here since this will be compiled by our clients and they may /* We can't use _ here since this will be compiled by our clients and they may
* not have _(). * not have _().
*/ */
#define vips_init( ARGV0 ) \ #define VIPS_INIT( ARGV0 ) \
(sizeof( VipsObject ) != vips__get_sizeof_vipsobject() ? ( \ (sizeof( VipsObject ) != vips__get_sizeof_vipsobject() ? ( \
vips_info( "vips_init", "ABI mismatch" ), \ vips_info( "vips_init", "ABI mismatch" ), \
vips_info( "vips_init", \ vips_info( "vips_init", \
"library has sizeof(VipsObject) == %zd", \ "library has sizeof(VipsObject) == %zd", \
vips__get_sizeof_vipsobject() ), \ vips__get_sizeof_vipsobject() ), \
vips_info( "vips_init", \ vips_info( "vips_init", \
"application has sizeof(VipsObject) == %zd", \ "application has sizeof(VipsObject) == %zd", \
sizeof( VipsObject ) ), \ sizeof( VipsObject ) ), \
vips_error( "vips_init", "ABI mismatch" ), \ vips_error( "vips_init", "ABI mismatch" ), \
-1 ) : \ -1 ) : \
vips__init( ARGV0 )) vips__init( ARGV0 ))
const char *vips_get_argv0( void ); const char *vips_get_argv0( void );
void vips_check_init( void );
void vips_shutdown( void ); void vips_shutdown( void );
void vips_thread_shutdown( void ); void vips_thread_shutdown( void );
GOptionGroup *vips_get_option_group( void ); GOptionGroup *vips_get_option_group( void );
const char *vips_version_string( void ); const char *vips_version_string( void );
int vips_version( int flag ); int vips_version( int flag );
const char *vips_guess_prefix( const char *argv0, const char *env_name ); const char *vips_guess_prefix( const char *argv0, const char *env_name );
const char *vips_guess_libdir( const char *argv0, const char *env_name ); const char *vips_guess_libdir( const char *argv0, const char *env_name );
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 vips7compat.h   vips7compat.h 
skipping to change at line 269 skipping to change at line 269
#define im_image_sanity( I ) (!vips_object_sanity( VIPS_OBJECT( I ) )) #define im_image_sanity( I ) (!vips_object_sanity( VIPS_OBJECT( I ) ))
#define im_image_sanity_all vips_object_sanity_all #define im_image_sanity_all vips_object_sanity_all
#define im__print_all vips_object_print_all #define im__print_all vips_object_print_all
/* Compat functions. /* Compat functions.
*/ */
int im_init_world( const char *argv0 ); int im_init_world( const char *argv0 );
/* We used to have this in lowercase.
*/
#define vips_init(X) VIPS_INIT(X)
VipsImage *im_open( const char *filename, const char *mode ); VipsImage *im_open( const char *filename, const char *mode );
VipsImage *im_open_local( VipsImage *parent, VipsImage *im_open_local( VipsImage *parent,
const char *filename, const char *mode ); const char *filename, const char *mode );
int im_open_local_array( VipsImage *parent, int im_open_local_array( VipsImage *parent,
VipsImage **images, int n, const char *filename, const char *mode ); VipsImage **images, int n, const char *filename, const char *mode );
#define im_callback_fn VipsCallbackFn #define im_callback_fn VipsCallbackFn
int im_add_callback( VipsImage *im, int im_add_callback( VipsImage *im,
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 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/