debug.h   debug.h 
skipping to change at line 39 skipping to change at line 39
#ifndef IM_DEBUG_H #ifndef IM_DEBUG_H
#define IM_DEBUG_H #define IM_DEBUG_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /*__cplusplus*/ #endif /*__cplusplus*/
#ifdef VIPS_DEBUG #ifdef VIPS_DEBUG
#define VIPS_DEBUG_MSG( ... ) \ #define VIPS_DEBUG_MSG( ... ) \
G_STMT_START printf( __VA_ARGS__ ); G_STMT_END G_STMT_START { printf( __VA_ARGS__ ); } G_STMT_END
#else #else
#define VIPS_DEBUG_MSG( ... ) \ #define VIPS_DEBUG_MSG( ... ) \
G_STMT_START ; G_STMT_END G_STMT_START { ; } G_STMT_END
#endif /*VIPS_DEBUG*/ #endif /*VIPS_DEBUG*/
#ifdef VIPS_DEBUG_RED #ifdef VIPS_DEBUG_RED
#define VIPS_DEBUG_MSG_RED( ... ) \ #define VIPS_DEBUG_MSG_RED( ... ) \
G_STMT_START printf( "red: " __VA_ARGS__ ); G_STMT_END G_STMT_START { printf( "red: " __VA_ARGS__ ); } G_STMT_END
#else #else
#define VIPS_DEBUG_MSG_RED( ... ) \ #define VIPS_DEBUG_MSG_RED( ... ) \
G_STMT_START ; G_STMT_END G_STMT_START { ; } G_STMT_END
#endif /*VIPS_DEBUG_RED*/ #endif /*VIPS_DEBUG_RED*/
#ifdef VIPS_DEBUG_AMBER #ifdef VIPS_DEBUG_AMBER
#define VIPS_DEBUG_MSG_AMBER( ... ) \ #define VIPS_DEBUG_MSG_AMBER( ... ) \
G_STMT_START printf( "amber: " __VA_ARGS__ ); G_STMT_END G_STMT_START { printf( "amber: " __VA_ARGS__ ); } G_STMT_END
#else #else
#define VIPS_DEBUG_MSG_AMBER( ... ) \ #define VIPS_DEBUG_MSG_AMBER( ... ) \
G_STMT_START ; G_STMT_END G_STMT_START { ; } G_STMT_END
#endif /*VIPS_DEBUG_AMBER*/ #endif /*VIPS_DEBUG_AMBER*/
#ifdef VIPS_DEBUG_GREEN #ifdef VIPS_DEBUG_GREEN
#define VIPS_DEBUG_MSG_GREEN( ... ) \ #define VIPS_DEBUG_MSG_GREEN( ... ) \
G_STMT_START printf( "green: " __VA_ARGS__ ); G_STMT_END G_STMT_START { printf( "green: " __VA_ARGS__ ); } G_STMT_END
#else #else
#define VIPS_DEBUG_MSG_GREEN( ... ) \ #define VIPS_DEBUG_MSG_GREEN( ... ) \
G_STMT_START ; G_STMT_END G_STMT_START { ; } G_STMT_END
#endif /*VIPS_DEBUG_GREEN*/ #endif /*VIPS_DEBUG_GREEN*/
/* All open image descriptors ... see im_init() and im_close(). /* All open image descriptors ... see im_init() and im_close().
*/ */
extern GSList *im__open_images; extern GSList *im__open_images;
/* Print one line for each descriptor, complete dump for one descriptor. /* Print one line for each descriptor, complete dump for one descriptor.
*/ */
void im__print_one( int n ); void im__print_one( int n );
void im__print_all( void ); void im__print_all( void );
 End of changes. 8 change blocks. 
8 lines changed or deleted 8 lines changed or added


 util.h   util.h 
skipping to change at line 52 skipping to change at line 52
/* Some platforms don't have M_PI in math.h :-( /* Some platforms don't have M_PI in math.h :-(
*/ */
#define IM_PI (3.14159265358979323846) #define IM_PI (3.14159265358979323846)
/* Convert degrees->rads and vice-versa. /* Convert degrees->rads and vice-versa.
*/ */
#define IM_RAD( r ) (((r) / 360.0) * 2.0 * IM_PI) #define IM_RAD( r ) (((r) / 360.0) * 2.0 * IM_PI)
#define IM_DEG( a ) (((a) / (2.0 * IM_PI)) * 360.0) #define IM_DEG( a ) (((a) / (2.0 * IM_PI)) * 360.0)
#define IM_MAX(A,B) ((A)>(B)?(A):(B)) #define IM_MAX( A, B ) ((A) > (B) ? (A) : (B))
#define IM_MIN(A,B) ((A)<(B)?(A):(B)) #define IM_MIN( A, B ) ((A) < (B) ? (A) : (B))
#define IM_ABS(x) (((x) >= 0) ? (x) : -(x)) #define IM_ABS( x ) (((x) >= 0) ? (x) : -(x))
#define IM_CLIP(A,V,B) IM_MAX( (A), IM_MIN( (B), (V) ) ) #define IM_CLIP( A, V, B ) IM_MAX( (A), IM_MIN( (B), (V) ) )
#define IM_NUMBER(R) ((int)(sizeof(R)/sizeof(R[0]))) #define IM_NUMBER( R ) ((int) (sizeof(R) / sizeof(R[0])))
#define IM_FREEF( F, S ) \ #define IM_FREEF( F, S ) \
G_STMT_START \ G_STMT_START { \
if( S ) { \ if( S ) { \
(void) F( (S) ); \ (void) F( (S) ); \
(S) = 0; \ (S) = 0; \
} \ } \
G_STMT_END } G_STMT_END
/* Can't just use IM_FREEF(), we want the extra cast to void on the argumen t /* Can't just use IM_FREEF(), we want the extra cast to void on the argumen t
* to im_free() to make sure we can work for "const char *" variables. * to im_free() to make sure we can work for "const char *" variables.
*/ */
#define IM_FREE( S ) \ #define IM_FREE( S ) \
G_STMT_START \ G_STMT_START { \
if( S ) { \ if( S ) { \
(void) im_free( (void *) (S) ); \ (void) im_free( (void *) (S) ); \
(S) = 0; \ (S) = 0; \
} \ } \
G_STMT_END } G_STMT_END
#define IM_SETSTR( S, V ) \ #define IM_SETSTR( S, V ) \
G_STMT_START { \ G_STMT_START { \
const char *sst = (V); \ const char *sst = (V); \
\ \
if( (S) != sst ) { \ if( (S) != sst ) { \
if( !(S) || !sst || strcmp( (S), sst ) != 0 ) { \ if( !(S) || !sst || strcmp( (S), sst ) != 0 ) { \
IM_FREE( S ); \ IM_FREE( S ); \
if( sst ) \ if( sst ) \
(S) = im_strdup( NULL, sst ); \ (S) = im_strdup( NULL, sst ); \
 End of changes. 6 change blocks. 
9 lines changed or deleted 9 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.22.4" #define IM_VERSION "7.22.5"
#define IM_VERSION_STRING "7.22.4-Tue Jan 21 00:39:40 MSK 2014" #define IM_VERSION_STRING "7.22.5-Tue Jan 21 00:37:40 MSK 2014"
#define IM_MAJOR_VERSION (7) #define IM_MAJOR_VERSION (7)
#define IM_MINOR_VERSION (22) #define IM_MINOR_VERSION (22)
#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/