Merge branch 'master' of github.com:jcupitt/libvips

This commit is contained in:
John Cupitt 2018-06-01 19:46:42 +01:00
commit 892fa2eeba
2 changed files with 2 additions and 2 deletions

View File

@ -101,7 +101,7 @@ void *vips_area_get_data( VipsArea *area,
#define VIPS_ARRAY_ADDR( X, I ) \
(((I) >= 0 && (I) < VIPS_AREA( X )->n) ? \
(void *) ((VipsPel *) VIPS_AREA( X )->data + \
VIPS_AREA( X )->sizeof_type * (I)) : \
VIPS_AREA( X )->sizeof_type * (I)) : \
(fprintf( stderr, \
"VIPS_ARRAY_ADDR: index out of bounds, " \
"file \"%s\", line %d\n" \

View File

@ -63,7 +63,7 @@ Copyright K.Martinez 30/6/93
#include <vips/internal.h>
#include <vips/debug.h>
/* We have to represent all header fields as char* so we can spot unset args
/* We have to represent all header fields as char * so we can spot unset args
* safely.
*/
static char *xsize = NULL;