From d88304a297b1c85ecad2a772b24bfeff1e7009bc Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Thu, 12 Nov 2015 09:15:31 +0000 Subject: [PATCH] sync --- TODO | 9 +-------- libvips/conversion/bandjoin.c | 3 ++- libvips/deprecated/im_vips2mask.c | 3 --- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/TODO b/TODO index c48174ee..259ce8c9 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ +- still not happy about float->int mask conversion in im_vips2mask.c - looks like we have a race in tiled threadcache? see @@ -94,12 +95,6 @@ -- use vips_resize() in vipsthumbnail? - - should the sharpening filter be selectable? - -- look over vipsthumbnail with a profiler again - - test other cpp arg types input int works @@ -120,8 +115,6 @@ - fix up aconv -- can we pick the vipsthumbnail int shrink factor more intelligently? - - rewrite im_conv() etc. as vips_conv(), also the mosaicing functions finally finish --disable-deprecated option diff --git a/libvips/conversion/bandjoin.c b/libvips/conversion/bandjoin.c index 86a4bc45..e69b2089 100644 --- a/libvips/conversion/bandjoin.c +++ b/libvips/conversion/bandjoin.c @@ -107,7 +107,8 @@ vips_bandjoin_buffer( VipsBandary *bandary, VipsPel *q, VipsPel **p, int width ) */ int ips = VIPS_IMAGE_SIZEOF_PEL( in[i] ); - VipsPel *p1, *q1; + VipsPel * restrict p1; + VipsPel * restrict q1; int x, z; q1 = q; diff --git a/libvips/deprecated/im_vips2mask.c b/libvips/deprecated/im_vips2mask.c index d1c56300..384f1fc0 100644 --- a/libvips/deprecated/im_vips2mask.c +++ b/libvips/deprecated/im_vips2mask.c @@ -241,9 +241,6 @@ im_vips2imask( IMAGE *in, const char *filename ) if( out->scale == 0 ) out->scale = 1; - /* We should probably do the same for offset, somehow. - */ - return( out ); }