From 95fc8190faad248a2318e89184e7c5d3f4606cf0 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 27 Jan 2012 09:22:08 +0000 Subject: [PATCH] sync --- TODO | 5 +++++ libvips/freq_filt/im_invfftr.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index fc03293f..e909ec7c 100644 --- a/TODO +++ b/TODO @@ -42,8 +42,13 @@ vips invfft1-1: done in 0s Segmentation fault + works in 7.26 with the same libfftw, perhaps the iochecks we removed? + add a test to the suite + remove the old fft fallback + + - we have VipsArrayObject and also vips_object_local_array() diff --git a/libvips/freq_filt/im_invfftr.c b/libvips/freq_filt/im_invfftr.c index f420a69b..ee6913c5 100644 --- a/libvips/freq_filt/im_invfftr.c +++ b/libvips/freq_filt/im_invfftr.c @@ -175,7 +175,9 @@ invfft1( IMAGE *dummy, IMAGE *in, IMAGE *out ) if( im_cp_desc( real, in ) ) return( -1 ); real->BandFmt = IM_BANDFMT_DOUBLE; - if( im_setupout( real ) ) + if( im_setupout( real ) || + im_incheck( cmplx ) || + im_incheck( real ) ) return( -1 ); /* Build half-complex image.