private.h   private.h 
skipping to change at line 46 skipping to change at line 46
#define IM_PRIVATE_H #define IM_PRIVATE_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /*__cplusplus*/ #endif /*__cplusplus*/
#define IM_SPARE (8) #define IM_SPARE (8)
/* Private to iofuncs: the image size above which we switch from /* Private to iofuncs: the image size above which we switch from
* mmap()-whole-image behaviour to mmap()-window, plus window margins. * mmap()-whole-image behaviour to mmap()-window, plus window margins.
*
* Always use mmap windows, they put a lot less strain on the VM system whe
n
* we have many open images.
*/ */
#define IM__MMAP_LIMIT (1024*1024*30) #define IM__MMAP_LIMIT (0)
#define IM__WINDOW_MARGIN (128) #define IM__WINDOW_MARGIN (128)
/* sizeof() a VIPS header on disc. /* sizeof() a VIPS header on disc.
*/ */
#define IM_SIZEOF_HEADER (64) #define IM_SIZEOF_HEADER (64)
typedef unsigned char PEL; /* useful datum */ typedef unsigned char PEL; /* useful datum */
/* Types of image descriptor we may have. The type field is advisory only: it /* Types of image descriptor we may have. The type field is advisory only: it
* does not imply that any fields in IMAGE have valid data. * does not imply that any fields in IMAGE have valid data.
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 version.h   version.h 
/* Macros for the header version. /* Macros for the header version.
*/ */
#ifndef IM_VERSION_H #ifndef IM_VERSION_H
#define IM_VERSION_H #define IM_VERSION_H
#define IM_VERSION "7.20.4" #define IM_VERSION "7.20.5"
#define IM_VERSION_STRING "7.20.4-Tue Jan 21 00:55:33 MSK 2014" #define IM_VERSION_STRING "7.20.5-Tue Jan 21 00:53:35 MSK 2014"
#define IM_MAJOR_VERSION (7) #define IM_MAJOR_VERSION (7)
#define IM_MINOR_VERSION (20) #define IM_MINOR_VERSION (20)
#define IM_MICRO_VERSION (4) #define IM_MICRO_VERSION (5)
#define IM_INTERFACE_AGE (@IM_INTERFACE_AGE@) #define IM_INTERFACE_AGE (@IM_INTERFACE_AGE@)
#define IM_BINARY_AGE (@IM_BINARY_AGE@) #define IM_BINARY_AGE (@IM_BINARY_AGE@)
#endif /*IM_VERSION_H*/ #endif /*IM_VERSION_H*/
 End of changes. 2 change blocks. 
3 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/