| VImage.h | VImage.h | |||
|---|---|---|---|---|
| skipping to change at line 66 | skipping to change at line 66 | |||
| */ | */ | |||
| struct im__function; | struct im__function; | |||
| typedef void *im__object; | typedef void *im__object; | |||
| } | } | |||
| VIPS_NAMESPACE_START | VIPS_NAMESPACE_START | |||
| /* vips_init() and vips_shutdown as namespaced C++ functions. | /* vips_init() and vips_shutdown as namespaced C++ functions. | |||
| */ | */ | |||
| bool init( const char *argv0 = "nothing" ); | bool init( const char *argv0 = "nothing" ); | |||
| void thread_shutdown( void ); | ||||
| void shutdown( void ); | void shutdown( void ); | |||
| /* A VIPS callback, our name for im_callback_fn. | /* A VIPS callback, our name for im_callback_fn. | |||
| */ | */ | |||
| typedef int (*VCallback)( void *, void * ); | typedef int (*VCallback)( void *, void * ); | |||
| /* VIPS image class. | /* VIPS image class. | |||
| * | * | |||
| * Slightly tricky: we have two sorts of sharing. Several VImage can share one | * Slightly tricky: we have two sorts of sharing. Several VImage can share one | |||
| * refblock (while results are being returned from functions, for example), | * refblock (while results are being returned from functions, for example), | |||
| skipping to change at line 454 | skipping to change at line 455 | |||
| void call(); | void call(); | |||
| }; | }; | |||
| #endif /*!SWIG*/ | #endif /*!SWIG*/ | |||
| VIPS_NAMESPACE_END | VIPS_NAMESPACE_END | |||
| // Other VIPS protos we need | // Other VIPS protos we need | |||
| extern "C" { | extern "C" { | |||
| extern int im_init_world( const char *argv0 ); | extern int im_init_world( const char *argv0 ); | |||
| extern int im_init_world( const char *argv0 ); | ||||
| extern void vips_thread_shutdown( void ); | ||||
| extern void im__print_all(); | extern void im__print_all(); | |||
| extern void im_col_Lab2XYZ( | extern void im_col_Lab2XYZ( | |||
| float, float, float, | float, float, float, | |||
| float *, float *, float * ); | float *, float *, float * ); | |||
| } | } | |||
| #endif /*IM_VIMAGE_H*/ | #endif /*IM_VIMAGE_H*/ | |||
| End of changes. 2 change blocks. | ||||
| 0 lines changed or deleted | 3 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.6" | #define VIPS_VERSION "7.40.7" | |||
| #define VIPS_VERSION_STRING "7.40.6-Fri Aug 22 00:42:21 MSK 2014" | #define VIPS_VERSION_STRING "7.40.7-Sun Sep 7 23:59:12 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 (6) | #define VIPS_MICRO_VERSION (7) | |||
| /* 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 | |||