make a fresh test dist

TODO

@@ -1,3 +1,18 @@
+- fix
+
+	sequential.c: In function 'vips_sequential_generate':
+	sequential.c:163:4: warning: 'g_cond_timed_wait' is deprecated
+	(declared at /usr/include/glib-2.0/glib/deprecated/gthread.h:279)
+	[-Wdeprecated-declarations]
+
+  add a wait until wrapper using 
+
+  	http://developer.gnome.org/glib/2.31/glib-Threads.html#g-cond-timed-until
+
+  as a guide
+
+- update the INCLUDES etc. stuff, see OS X build
+
 - quadratic doesn't work for order 3
 
   start to get jaggies on lines --- the 3rd differential isn't being 

libvips/deprecated/vips7compat.c

@@ -2145,7 +2145,6 @@ im_rightshift_size( IMAGE *in, IMAGE *out,
 	return( 0 );
 }
 
-<<<<<<< HEAD
 int 
 im_Lab2XYZ_temp( IMAGE *in, IMAGE *out, double X0, double Y0, double Z0 )
 {

po/POTFILES.in

@@ -1,259 +1,254 @@
-libvips/arithmetic/abs.c
+libvips/arithmetic/linear.c
+libvips/arithmetic/avg.c
+libvips/arithmetic/divide.c
+libvips/arithmetic/measure.c
+libvips/arithmetic/stats.c
+libvips/arithmetic/math2.c
+libvips/arithmetic/round.c
+libvips/arithmetic/deviate.c
+libvips/arithmetic/unary.c
+libvips/arithmetic/unaryconst.c
+libvips/arithmetic/add.c
+libvips/arithmetic/arithmetic.c
+libvips/arithmetic/multiply.c
+libvips/arithmetic/min.c
 libvips/arithmetic/complex.c
 libvips/arithmetic/invert.c
-libvips/arithmetic/im_maxpos_avg.c
-libvips/arithmetic/multiply.c
-libvips/arithmetic/round.c
-libvips/arithmetic/subtract.c
-libvips/arithmetic/min.c
-libvips/arithmetic/unaryconst.c
-libvips/arithmetic/im_point_bilinear.c
-libvips/arithmetic/avg.c
-libvips/arithmetic/arith_dispatch.c
-libvips/arithmetic/max.c
-libvips/arithmetic/statistic.c
-libvips/arithmetic/divide.c
-libvips/arithmetic/stats.c
-libvips/arithmetic/binary.c
-libvips/arithmetic/im_maxpos_vec.c
-libvips/arithmetic/deviate.c
-libvips/arithmetic/relational.c
-libvips/arithmetic/measure.c
 libvips/arithmetic/remainder.c
-libvips/arithmetic/unary.c
-libvips/arithmetic/im_linreg.c
 libvips/arithmetic/math.c
-libvips/arithmetic/arithmetic.c
+libvips/arithmetic/abs.c
-libvips/arithmetic/add.c
+libvips/arithmetic/relational.c
-libvips/arithmetic/im_cross_phase.c
+libvips/arithmetic/binary.c
-libvips/arithmetic/math2.c
-libvips/arithmetic/linear.c
-libvips/arithmetic/boolean.c
 libvips/arithmetic/sign.c
+libvips/arithmetic/subtract.c
+libvips/arithmetic/statistic.c
+libvips/arithmetic/boolean.c
+libvips/arithmetic/max.c
 libvips/cimg/cimg_dispatch.c
-libvips/colour/sRGB2XYZ.c
+libvips/colour/dE76.c
-libvips/colour/Lab2XYZ.c
-libvips/colour/LCh2Lab.c
-libvips/colour/LCh2UCS.c
-libvips/colour/dE00.c
-libvips/colour/icc_transform.c
-libvips/colour/colour_dispatch.c
-libvips/colour/dECMC.c
-libvips/colour/colour.c
-libvips/colour/rad2float.c
-libvips/colour/UCS2LCh.c
-libvips/colour/XYZ2sRGB.c
-libvips/colour/Lab2LabQ.c
 libvips/colour/colourspace.c
-libvips/colour/Lab2LabS.c
-libvips/colour/LabS2LabQ.c
 libvips/colour/Lab2LCh.c
+libvips/colour/LabS2LabQ.c
+libvips/colour/sRGB2scRGB.c
 libvips/colour/Yxy2XYZ.c
+libvips/colour/LCh2Lab.c
+libvips/colour/dE00.c
+libvips/colour/LabQ2Lab.c
+libvips/colour/Lab2XYZ.c
+libvips/colour/rad2float.c
+libvips/colour/Lab2LabQ.c
+libvips/colour/colour.c
 libvips/colour/LabQ2sRGB.c
+libvips/colour/XYZ2Lab.c
+libvips/colour/UCS2LCh.c
+libvips/colour/scRGB2XYZ.c
+libvips/colour/LabQ2LabS.c
+libvips/colour/LabS2Lab.c
 libvips/colour/float2rad.c
 libvips/colour/XYZ2Yxy.c
-libvips/colour/dE76.c
+libvips/colour/Lab2LabS.c
-libvips/colour/XYZ2Lab.c
+libvips/colour/icc_transform.c
-libvips/colour/LabQ2LabS.c
+libvips/colour/LCh2UCS.c
-libvips/colour/LabQ2Lab.c
+libvips/colour/XYZ2scRGB.c
-libvips/colour/LabS2Lab.c
+libvips/colour/dECMC.c
-libvips/conversion/rot.c
+libvips/colour/scRGB2sRGB.c
-libvips/conversion/conversion.c
-libvips/conversion/recomb.c
-libvips/conversion/flatten.c
-libvips/conversion/replicate.c
-libvips/conversion/bandary.c
-libvips/conversion/cache.c
-libvips/conversion/black.c
-libvips/conversion/im_msb.c
-libvips/conversion/join.c
-libvips/conversion/im_zoom.c
-libvips/conversion/extract.c
-libvips/conversion/ifthenelse.c
-libvips/conversion/im_scale.c
-libvips/conversion/tilecache.c
 libvips/conversion/flip.c
-libvips/conversion/conver_dispatch.c
+libvips/conversion/bandmean.c
-libvips/conversion/bandjoin.c
+libvips/conversion/im_zoom.c
-libvips/conversion/im_grid.c
-libvips/conversion/im_wrap.c
-libvips/conversion/im_subsample.c
-libvips/conversion/copy.c
-libvips/conversion/im_text.c
-libvips/conversion/cast.c
-libvips/conversion/sequential.c
-libvips/conversion/embed.c
-libvips/conversion/im_scaleps.c
-libvips/conversion/im_system_image.c
-libvips/conversion/insert.c
 libvips/conversion/im_system.c
 libvips/conversion/im_gaussnoise.c
-libvips/conversion/bandmean.c
+libvips/conversion/bandary.c
+libvips/conversion/cast.c
+libvips/conversion/conversion.c
+libvips/conversion/flatten.c
+libvips/conversion/im_subsample.c
+libvips/conversion/im_grid.c
+libvips/conversion/extract.c
+libvips/conversion/bandjoin.c
+libvips/conversion/im_msb.c
 libvips/conversion/im_copy_file.c
+libvips/conversion/black.c
+libvips/conversion/bandbool.c
+libvips/conversion/copy.c
+libvips/conversion/rot.c
+libvips/conversion/im_scale.c
+libvips/conversion/replicate.c
+libvips/conversion/join.c
+libvips/conversion/im_text.c
+libvips/conversion/conver_dispatch.c
+libvips/conversion/im_scaleps.c
+libvips/conversion/im_wrap.c
+libvips/conversion/insert.c
+libvips/conversion/tilecache.c
+libvips/conversion/im_system_image.c
+libvips/conversion/embed.c
+libvips/conversion/cache.c
 libvips/conversion/im_falsecolour.c
-libvips/convolution/im_fastcor.c
+libvips/conversion/ifthenelse.c
-libvips/convolution/im_aconv.c
+libvips/conversion/recomb.c
-libvips/convolution/im_sharpen.c
+libvips/conversion/sequential.c
-libvips/convolution/convol_dispatch.c
 libvips/convolution/im_conv.c
-libvips/convolution/im_addgnoise.c
+libvips/convolution/im_fastcor.c
 libvips/convolution/im_contrast_surface.c
-libvips/convolution/im_aconvsep.c
-libvips/convolution/im_spcor.c
 libvips/convolution/im_compass.c
-libvips/convolution/im_conv_f.c
+libvips/convolution/im_spcor.c
 libvips/convolution/im_gradcor.c
-libvips/foreign/jpeg2vips.c
+libvips/convolution/im_conv_f.c
-libvips/foreign/radiance.c
+libvips/convolution/im_aconvsep.c
-libvips/foreign/vips2jpeg.c
+libvips/convolution/convol_dispatch.c
-libvips/foreign/openexrload.c
+libvips/convolution/im_aconv.c
-libvips/foreign/vipssave.c
+libvips/convolution/im_addgnoise.c
+libvips/convolution/im_sharpen.c
 libvips/foreign/rawsave.c
-libvips/foreign/csvsave.c
+libvips/foreign/radload.c
-libvips/foreign/radsave.c
-libvips/foreign/rawload.c
-libvips/foreign/vips2tiff.c
-libvips/foreign/fits.c
-libvips/foreign/matlab.c
-libvips/foreign/csvload.c
-libvips/foreign/jpegload.c
-libvips/foreign/magickload.c
-libvips/foreign/matload.c
-libvips/foreign/tiff2vips.c
-libvips/foreign/openexr2vips.c
-libvips/foreign/foreign.c
-libvips/foreign/jpegsave.c
-libvips/foreign/dzsave.c
-libvips/foreign/openslide2vips.c
-libvips/foreign/analyze2vips.c
-libvips/foreign/ppmsave.c
-libvips/foreign/tiffsave.c
-libvips/foreign/fitssave.c
-libvips/foreign/csv.c
-libvips/foreign/pngload.c
-libvips/foreign/fitsload.c
-libvips/foreign/vipsload.c
-libvips/foreign/vipspng.c
 libvips/foreign/tiffload.c
 libvips/foreign/magick2vips.c
+libvips/foreign/ppmsave.c
+libvips/foreign/vipsload.c
+libvips/foreign/pngload.c
+libvips/foreign/analyze2vips.c
+libvips/foreign/jpeg2vips.c
+libvips/foreign/radiance.c
+libvips/foreign/openexrload.c
+libvips/foreign/tiffsave.c
+libvips/foreign/dzsave.c
 libvips/foreign/analyzeload.c
+libvips/foreign/jpegsave.c
+libvips/foreign/vips2jpeg.c
 libvips/foreign/ppm.c
-libvips/foreign/openslideload.c
+libvips/foreign/fitsload.c
-libvips/foreign/pngsave.c
-libvips/foreign/radload.c
 libvips/foreign/ppmload.c
-libvips/freq_filt/fmask4th.c
+libvips/foreign/csvload.c
-libvips/freq_filt/im_rotquad.c
+libvips/foreign/magickload.c
-libvips/freq_filt/im_disp_ps.c
+libvips/foreign/openslideload.c
-libvips/freq_filt/fmaskcir.c
+libvips/foreign/csvsave.c
-libvips/freq_filt/im_fractsurf.c
+libvips/foreign/jpegload.c
-libvips/freq_filt/im_invfft.c
+libvips/foreign/rawload.c
-libvips/freq_filt/im_freqflt.c
+libvips/foreign/openexr2vips.c
-libvips/freq_filt/freq_dispatch.c
+libvips/foreign/tiff2vips.c
-libvips/freq_filt/im_freq_mask.c
+libvips/foreign/csv.c
+libvips/foreign/matload.c
+libvips/foreign/fitssave.c
+libvips/foreign/radsave.c
+libvips/foreign/vipssave.c
+libvips/foreign/fits.c
+libvips/foreign/openslide2vips.c
+libvips/foreign/pngsave.c
+libvips/foreign/vips2tiff.c
+libvips/foreign/foreign.c
+libvips/foreign/vipspng.c
+libvips/foreign/matlab.c
 libvips/freq_filt/im_phasecor_fft.c
-libvips/freq_filt/im_invfftr.c
+libvips/freq_filt/im_freqflt.c
+libvips/freq_filt/im_fractsurf.c
+libvips/freq_filt/im_freq_mask.c
+libvips/freq_filt/freq_dispatch.c
+libvips/freq_filt/im_disp_ps.c
 libvips/freq_filt/im_fwfft.c
-libvips/histograms_lut/im_hsp.c
+libvips/freq_filt/im_invfftr.c
-libvips/histograms_lut/tone.c
+libvips/freq_filt/fmaskcir.c
-libvips/histograms_lut/im_histspec.c
+libvips/freq_filt/fmask4th.c
-libvips/histograms_lut/im_mpercent.c
+libvips/freq_filt/im_invfft.c
-libvips/histograms_lut/im_stdif.c
+libvips/freq_filt/im_rotquad.c
-libvips/histograms_lut/hist_dispatch.c
+libvips/histograms_lut/im_histeq.c
-libvips/histograms_lut/im_heq.c
-libvips/histograms_lut/im_histnD.c
-libvips/histograms_lut/im_invertlut.c
-libvips/histograms_lut/im_histindexed.c
 libvips/histograms_lut/im_buildlut.c
+libvips/histograms_lut/im_histnD.c
+libvips/histograms_lut/im_histspec.c
+libvips/histograms_lut/im_heq.c
+libvips/histograms_lut/im_hist.c
+libvips/histograms_lut/im_stdif.c
+libvips/histograms_lut/im_invertlut.c
+libvips/histograms_lut/im_histplot.c
 libvips/histograms_lut/im_project.c
+libvips/histograms_lut/im_gammacorrect.c
+libvips/histograms_lut/im_hsp.c
+libvips/histograms_lut/im_mpercent.c
+libvips/histograms_lut/im_histgr.c
+libvips/histograms_lut/hist_dispatch.c
+libvips/histograms_lut/im_histindexed.c
+libvips/histograms_lut/tone.c
+libvips/histograms_lut/im_lhisteq.c
 libvips/histograms_lut/im_identity.c
 libvips/histograms_lut/im_maplut.c
-libvips/histograms_lut/im_histeq.c
-libvips/histograms_lut/im_lhisteq.c
-libvips/histograms_lut/im_gammacorrect.c
-libvips/histograms_lut/im_histgr.c
-libvips/histograms_lut/im_histplot.c
-libvips/histograms_lut/im_hist.c
-libvips/inplace/im_draw_smudge.c
-libvips/inplace/im_draw_circle.c
-libvips/inplace/im_draw_rect.c
-libvips/inplace/im_draw_mask.c
-libvips/inplace/draw.c
 libvips/inplace/im_draw_point.c
-libvips/inplace/flood.c
-libvips/inplace/im_draw_image.c
 libvips/inplace/im_draw_line.c
+libvips/inplace/im_draw_rect.c
+libvips/inplace/im_draw_image.c
+libvips/inplace/draw.c
+libvips/inplace/flood.c
+libvips/inplace/im_draw_circle.c
+libvips/inplace/im_draw_mask.c
+libvips/inplace/im_draw_smudge.c
 libvips/inplace/inplace_dispatch.c
-libvips/iofuncs/window.c
-libvips/iofuncs/base64.c
-libvips/iofuncs/type.c
-libvips/iofuncs/memory.c
-libvips/iofuncs/vips.c
-libvips/iofuncs/init.c
-libvips/iofuncs/enumtypes.c
-libvips/iofuncs/cache.c
-libvips/iofuncs/buffer.c
-libvips/iofuncs/sinkmemory.c
-libvips/iofuncs/rect.c
-libvips/iofuncs/buf.c
-libvips/iofuncs/threadpool.c
-libvips/iofuncs/operation.c
-libvips/iofuncs/header.c
 libvips/iofuncs/vector.c
-libvips/iofuncs/semaphore.c
+libvips/iofuncs/operation.c
-libvips/iofuncs/error.c
 libvips/iofuncs/sinkdisc.c
-libvips/iofuncs/sink.c
+libvips/iofuncs/vips.c
-libvips/iofuncs/generate.c
+libvips/iofuncs/buffer.c
-libvips/iofuncs/region.c
+libvips/iofuncs/enumtypes.c
-libvips/iofuncs/mapfile.c
+libvips/iofuncs/semaphore.c
-libvips/iofuncs/image.c
-libvips/iofuncs/util.c
 libvips/iofuncs/sinkscreen.c
+libvips/iofuncs/window.c
+libvips/iofuncs/sinkmemory.c
+libvips/iofuncs/header.c
+libvips/iofuncs/type.c
+libvips/iofuncs/image.c
+libvips/iofuncs/region.c
+libvips/iofuncs/sink.c
+libvips/iofuncs/error.c
+libvips/iofuncs/util.c
+libvips/iofuncs/buf.c
+libvips/iofuncs/base64.c
+libvips/iofuncs/generate.c
+libvips/iofuncs/mapfile.c
+libvips/iofuncs/rect.c
+libvips/iofuncs/init.c
 libvips/iofuncs/object.c
+libvips/iofuncs/threadpool.c
+libvips/iofuncs/memory.c
+libvips/iofuncs/cache.c
 libvips/morphology/im_cntlines.c
-libvips/morphology/im_rank_image.c
-libvips/morphology/im_label_regions.c
-libvips/morphology/morphology.c
-libvips/morphology/im_zerox.c
 libvips/morphology/im_profile.c
 libvips/morphology/morph_dispatch.c
+libvips/morphology/im_rank_image.c
+libvips/morphology/morphology.c
+libvips/morphology/im_zerox.c
+libvips/morphology/im_label_regions.c
 libvips/morphology/im_rank.c
-libvips/mosaicing/im_tbmosaic.c
-libvips/mosaicing/im_avgdxdy.c
-libvips/mosaicing/im_tbcalcon.c
-libvips/mosaicing/im_tbmerge.c
-libvips/mosaicing/im_lrcalcon.c
-libvips/mosaicing/im_clinear.c
-libvips/mosaicing/im_remosaic.c
-libvips/mosaicing/im_maxpos_subpel.c
-libvips/mosaicing/im_chkpair.c
-libvips/mosaicing/im_initialize.c
-libvips/mosaicing/im_align_bands.c
 libvips/mosaicing/mosaic1.c
-libvips/mosaicing/im_lrmerge.c
+libvips/mosaicing/im_clinear.c
-libvips/mosaicing/im_lrmosaic.c
-libvips/mosaicing/im_improve.c
-libvips/mosaicing/mosaicing_dispatch.c
 libvips/mosaicing/match.c
+libvips/mosaicing/mosaicing_dispatch.c
+libvips/mosaicing/im_improve.c
+libvips/mosaicing/im_tbmosaic.c
+libvips/mosaicing/im_tbmerge.c
 libvips/mosaicing/global_balance.c
-libvips/other/im_eye.c
+libvips/mosaicing/im_align_bands.c
+libvips/mosaicing/im_lrmerge.c
+libvips/mosaicing/im_initialize.c
+libvips/mosaicing/im_avgdxdy.c
+libvips/mosaicing/im_maxpos_subpel.c
+libvips/mosaicing/im_lrmosaic.c
+libvips/mosaicing/im_lrcalcon.c
+libvips/mosaicing/im_chkpair.c
+libvips/mosaicing/im_remosaic.c
+libvips/mosaicing/im_tbcalcon.c
 libvips/other/other_dispatch.c
-libvips/other/im_grey.c
-libvips/other/im_sines.c
 libvips/other/im_benchmark.c
+libvips/other/im_sines.c
 libvips/other/im_make_xy.c
 libvips/other/im_zone.c
-libvips/resample/interpolate.c
+libvips/other/im_eye.c
+libvips/other/im_grey.c
+libvips/resample/quadratic.c
+libvips/resample/shrink.c
 libvips/resample/resample.c
 libvips/resample/transform.c
-libvips/resample/shrink.c
+libvips/resample/affine.c
-libvips/resample/im_affine.c
+libvips/resample/interpolate.c
-libvips/resample/resample_dispatch.c
+libvips/video/video_dispatch.c
-libvips/resample/quadratic.c
 libvips/video/im_video_test.c
 libvips/video/im_video_v4l1.c
-libvips/video/video_dispatch.c
 tools/edvips.c
 tools/find_mosaic.c
 tools/header.c
@@ -262,6 +257,6 @@ tools/vips.c
 tools/vipsthumbnail.c
 libvips/cimg/cimg.cpp
 libvips/resample/vsqbs.cpp
-libvips/resample/bicubic.cpp
-libvips/resample/lbb.cpp
 libvips/resample/nohalo.cpp
+libvips/resample/lbb.cpp
+libvips/resample/bicubic.cpp