better compiling without c++

closer to a painless no-c++ build, though not quite there yet

libvips/Makefile.am

@@ -34,9 +34,15 @@ SUBDIRS = \
 
 lib_LTLIBRARIES = libvips.la
 
-libvips_la_SOURCES = dummy.c 
+# empty means default to C linking
+libvips_la_SOURCES = 
+
+# if we have C++ components enabled, make sure we link the top-level with c++
+#
+# sadly the if/enndif isn't enough to stop automake detecting a c++ link even
+# when c++ is disabled ... comment out this line if you have linking problems
 if ENABLE_CXX
-libvips_la_SOURCES += cimg/dummy2.cc
+nodist_EXTRA_libvips_la_SOURCES = cimg/dummy2.cxx
 endif
 
 # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end

po/POTFILES.in

@@ -1,254 +1,254 @@
-libvips/arithmetic/im_deviate.c
-libvips/arithmetic/im_point_bilinear.c
-libvips/arithmetic/im_linreg.c
-libvips/arithmetic/arith_dispatch.c
-libvips/arithmetic/im_subtract.c
-libvips/arithmetic/im_stats.c
-libvips/arithmetic/im_maxpos.c
-libvips/arithmetic/im_maxpos_avg.c
-libvips/arithmetic/im_maxpos_vec.c
 libvips/arithmetic/im_invert.c
-libvips/arithmetic/arithmetic.c
-libvips/arithmetic/im_sign.c
-libvips/arithmetic/add.c
-libvips/arithmetic/round.c
-libvips/arithmetic/im_measure.c
-libvips/arithmetic/math.c
-libvips/arithmetic/im_minpos.c
 libvips/arithmetic/im_abs.c
-libvips/arithmetic/im_recomb.c
+libvips/arithmetic/arith_dispatch.c
-libvips/arithmetic/im_cross_phase.c
-libvips/arithmetic/im_divide.c
 libvips/arithmetic/im_bandmean.c
-libvips/arithmetic/im_lintra.c
+libvips/arithmetic/im_linreg.c
-libvips/arithmetic/im_remainder.c
-libvips/arithmetic/binary.c
 libvips/arithmetic/power.c
-libvips/arithmetic/im_avg.c
+libvips/arithmetic/round.c
+libvips/arithmetic/im_deviate.c
+libvips/arithmetic/im_maxpos.c
+libvips/arithmetic/add.c
+libvips/arithmetic/arithmetic.c
+libvips/arithmetic/im_subtract.c
+libvips/arithmetic/im_minpos.c
+libvips/arithmetic/im_point_bilinear.c
+libvips/arithmetic/im_cross_phase.c
+libvips/arithmetic/im_recomb.c
+libvips/arithmetic/im_maxpos_avg.c
+libvips/arithmetic/im_stats.c
+libvips/arithmetic/math.c
+libvips/arithmetic/im_sign.c
 libvips/arithmetic/im_multiply.c
-libvips/boolean/boolean.c
+libvips/arithmetic/im_divide.c
+libvips/arithmetic/im_avg.c
+libvips/arithmetic/im_lintra.c
+libvips/arithmetic/binary.c
+libvips/arithmetic/im_maxpos_vec.c
+libvips/arithmetic/im_remainder.c
+libvips/arithmetic/im_measure.c
 libvips/boolean/bool_dispatch.c
+libvips/boolean/boolean.c
 libvips/cimg/cimg_dispatch.c
-libvips/colour/im_rad2float.c
-libvips/colour/im_LCh2UCS.c
-libvips/colour/im_icc_transform.c
-libvips/colour/disp.c
-libvips/colour/im_dE_fromLab.c
-libvips/colour/im_Yxy2XYZ.c
-libvips/colour/im_LabQ2disp.c
-libvips/colour/im_Lab2LabS.c
-libvips/colour/im_LabQ2Lab.c
-libvips/colour/im_UCS2LCh.c
-libvips/colour/im_LabS2Lab.c
-libvips/colour/im_dECMC_fromLab.c
-libvips/colour/im_LabQ2LabS.c
-libvips/colour/im_Lab2XYZ.c
-libvips/colour/im_disp2XYZ.c
 libvips/colour/im_XYZ2disp.c
+libvips/colour/im_LabQ2LabS.c
+libvips/colour/im_dECMC_fromLab.c
+libvips/colour/colour_dispatch.c
+libvips/colour/im_LCh2UCS.c
+libvips/colour/im_Lab2LabQ.c
+libvips/colour/im_Lab2LabS.c
+libvips/colour/im_XYZ2Yxy.c
+libvips/colour/im_disp2XYZ.c
+libvips/colour/im_UCS2LCh.c
+libvips/colour/im_LabQ2Lab.c
+libvips/colour/disp.c
+libvips/colour/im_LCh2Lab.c
 libvips/colour/colour.c
+libvips/colour/im_rad2float.c
+libvips/colour/im_icc_transform.c
+libvips/colour/derived.c
 libvips/colour/im_float2rad.c
 libvips/colour/im_Lab2LCh.c
-libvips/colour/colour_dispatch.c
+libvips/colour/im_LabS2Lab.c
-libvips/colour/derived.c
-libvips/colour/im_LabS2LabQ.c
 libvips/colour/im_dE00_fromLab.c
-libvips/colour/im_lab_morph.c
-libvips/colour/im_XYZ2Yxy.c
-libvips/colour/im_Lab2LabQ.c
-libvips/colour/im_LCh2Lab.c
 libvips/colour/im_XYZ2Lab.c
-libvips/conversion/im_insert.c
+libvips/colour/im_Yxy2XYZ.c
-libvips/conversion/im_mask2vips.c
+libvips/colour/im_lab_morph.c
-libvips/conversion/im_gaussnoise.c
+libvips/colour/im_dE_fromLab.c
-libvips/conversion/im_flipver.c
+libvips/colour/im_Lab2XYZ.c
-libvips/conversion/im_falsecolour.c
+libvips/colour/im_LabQ2disp.c
-libvips/conversion/im_vips2mask.c
+libvips/colour/im_LabS2LabQ.c
-libvips/conversion/im_clip2fmt.c
-libvips/conversion/im_ri2c.c
-libvips/conversion/im_system.c
-libvips/conversion/im_text.c
-libvips/conversion/im_zoom.c
-libvips/conversion/conver_dispatch.c
-libvips/conversion/im_copy_file.c
-libvips/conversion/im_c2real.c
-libvips/conversion/im_grid.c
-libvips/conversion/im_c2imag.c
-libvips/conversion/im_scaleps.c
-libvips/conversion/im_fliphor.c
-libvips/conversion/im_scale.c
-libvips/conversion/im_black.c
 libvips/conversion/im_tbjoin.c
-libvips/conversion/im_replicate.c
+libvips/conversion/im_zoom.c
-libvips/conversion/im_embed.c
+libvips/conversion/im_system.c
-libvips/conversion/im_lrjoin.c
 libvips/conversion/im_rot180.c
-libvips/conversion/im_extract.c
+libvips/conversion/im_gaussnoise.c
-libvips/conversion/im_wrap.c
+libvips/conversion/im_black.c
-libvips/conversion/im_c2rect.c
+libvips/conversion/im_clip2fmt.c
-libvips/conversion/im_copy.c
+libvips/conversion/im_lrjoin.c
-libvips/conversion/im_rot90.c
+libvips/conversion/im_flipver.c
-libvips/conversion/im_c2amph.c
+libvips/conversion/im_vips2mask.c
-libvips/conversion/im_msb.c
-libvips/conversion/im_system_image.c
 libvips/conversion/im_subsample.c
 libvips/conversion/im_rot270.c
+libvips/conversion/im_grid.c
+libvips/conversion/im_msb.c
+libvips/conversion/im_copy_file.c
+libvips/conversion/im_extract.c
+libvips/conversion/im_ri2c.c
+libvips/conversion/im_scale.c
 libvips/conversion/im_gbandjoin.c
-libvips/convolution/im_contrast_surface.c
+libvips/conversion/im_text.c
-libvips/convolution/im_aconvsep.c
+libvips/conversion/conver_dispatch.c
-libvips/convolution/im_gradcor.c
+libvips/conversion/im_c2rect.c
-libvips/convolution/im_compass.c
+libvips/conversion/im_c2real.c
+libvips/conversion/im_scaleps.c
+libvips/conversion/im_copy.c
+libvips/conversion/im_wrap.c
+libvips/conversion/im_insert.c
+libvips/conversion/im_mask2vips.c
+libvips/conversion/im_fliphor.c
+libvips/conversion/im_c2imag.c
+libvips/conversion/im_embed.c
+libvips/conversion/im_system_image.c
+libvips/conversion/im_c2amph.c
+libvips/conversion/im_falsecolour.c
+libvips/conversion/im_rot90.c
+libvips/conversion/im_replicate.c
 libvips/convolution/im_conv.c
 libvips/convolution/im_fastcor.c
-libvips/convolution/convol_dispatch.c
+libvips/convolution/im_contrast_surface.c
-libvips/convolution/im_conv_f.c
+libvips/convolution/im_compass.c
-libvips/convolution/im_addgnoise.c
 libvips/convolution/im_spcor.c
-libvips/convolution/im_sharpen.c
+libvips/convolution/im_gradcor.c
+libvips/convolution/im_conv_f.c
+libvips/convolution/im_aconvsep.c
+libvips/convolution/convol_dispatch.c
 libvips/convolution/im_aconv.c
+libvips/convolution/im_addgnoise.c
+libvips/convolution/im_sharpen.c
 libvips/dummy.c
-libvips/format/im_tile_cache.c
-libvips/format/im_ppm2vips.c
-libvips/format/format.c
 libvips/format/im_vips2tiff.c
-libvips/format/im_vips2csv.c
-libvips/format/im_vips2ppm.c
-libvips/format/im_png2vips.c
 libvips/format/format_dispatch.c
-libvips/format/im_analyze2vips.c
+libvips/format/im_vips2jpeg.c
-libvips/format/im_magick2vips.c
-libvips/format/im_vips2raw.c
-libvips/format/im_tiff2vips.c
-libvips/format/im_exr2vips.c
-libvips/format/matlab.c
-libvips/format/im_jpeg2vips.c
-libvips/format/fits.c
 libvips/format/im_csv2vips.c
-libvips/format/im_vips2png.c
 libvips/format/radiance.c
 libvips/format/im_raw2vips.c
-libvips/format/im_vips2jpeg.c
+libvips/format/format.c
-libvips/freq_filt/im_freq_mask.c
+libvips/format/im_vips2png.c
+libvips/format/im_vips2csv.c
+libvips/format/im_png2vips.c
+libvips/format/im_exr2vips.c
+libvips/format/im_magick2vips.c
+libvips/format/im_vips2ppm.c
+libvips/format/im_tiff2vips.c
+libvips/format/im_ppm2vips.c
+libvips/format/im_vips2raw.c
+libvips/format/im_tile_cache.c
+libvips/format/im_jpeg2vips.c
+libvips/format/fits.c
+libvips/format/im_analyze2vips.c
+libvips/format/matlab.c
 libvips/freq_filt/im_phasecor_fft.c
-libvips/freq_filt/fft_sp.c
-libvips/freq_filt/fmaskcir.c
-libvips/freq_filt/im_fractsurf.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/freq_filt/im_invfftr.c
+libvips/freq_filt/fmaskcir.c
 libvips/freq_filt/fmask4th.c
 libvips/freq_filt/im_invfft.c
-libvips/freq_filt/freq_dispatch.c
+libvips/freq_filt/fft_sp.c
 libvips/freq_filt/im_rotquad.c
-libvips/freq_filt/im_invfftr.c
+libvips/histograms_lut/im_histeq.c
-libvips/freq_filt/im_fwfft.c
+libvips/histograms_lut/im_buildlut.c
-libvips/freq_filt/im_disp_ps.c
-libvips/histograms_lut/im_gammacorrect.c
-libvips/histograms_lut/im_hist.c
-libvips/histograms_lut/im_project.c
-libvips/histograms_lut/im_stdif.c
-libvips/histograms_lut/im_mpercent.c
 libvips/histograms_lut/im_histnD.c
 libvips/histograms_lut/im_histspec.c
-libvips/histograms_lut/im_identity.c
-libvips/histograms_lut/im_histindexed.c
-libvips/histograms_lut/hist_dispatch.c
-libvips/histograms_lut/im_hsp.c
-libvips/histograms_lut/im_histgr.c
-libvips/histograms_lut/im_buildlut.c
-libvips/histograms_lut/tone.c
-libvips/histograms_lut/im_histeq.c
-libvips/histograms_lut/im_histplot.c
-libvips/histograms_lut/im_lhisteq.c
-libvips/histograms_lut/im_invertlut.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/inplace/im_draw_point.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_smudge.c
-libvips/inplace/im_draw_rect.c
-libvips/inplace/im_draw_line.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/sink.c
-libvips/iofuncs/rect.c
-libvips/iofuncs/semaphore.c
-libvips/iofuncs/memory.c
-libvips/iofuncs/vips.c
-libvips/iofuncs/generate.c
-libvips/iofuncs/region.c
-libvips/iofuncs/init.c
-libvips/iofuncs/image.c
-libvips/iofuncs/sinkscreen.c
 libvips/iofuncs/vector.c
-libvips/iofuncs/mapfile.c
-libvips/iofuncs/base64.c
-libvips/iofuncs/object.c
-libvips/iofuncs/buf.c
-libvips/iofuncs/pool.c
-libvips/iofuncs/util.c
-libvips/iofuncs/enumtypes.c
 libvips/iofuncs/operation.c
-libvips/iofuncs/header.c
-libvips/iofuncs/sinkmemory.c
-libvips/iofuncs/window.c
 libvips/iofuncs/sinkdisc.c
+libvips/iofuncs/pool.c
+libvips/iofuncs/vips.c
 libvips/iofuncs/buffer.c
+libvips/iofuncs/enumtypes.c
+libvips/iofuncs/semaphore.c
+libvips/iofuncs/sinkscreen.c
+libvips/iofuncs/window.c
+libvips/iofuncs/sinkmemory.c
+libvips/iofuncs/header.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/mask/mask_dispatch.c
+libvips/mask/rotmask.c
+libvips/mask/im_logmasks.c
 libvips/mask/im_matcat.c
+libvips/mask/matalloc.c
+libvips/mask/im_gaussmasks.c
 libvips/mask/rw_mask.c
-libvips/mask/im_matinv.c
 libvips/mask/im_mattrn.c
 libvips/mask/im_matmul.c
-libvips/mask/im_logmasks.c
+libvips/mask/im_matinv.c
-libvips/mask/im_gaussmasks.c
-libvips/mask/rotmask.c
-libvips/mask/matalloc.c
-libvips/mask/mask_dispatch.c
-libvips/morphology/im_profile.c
-libvips/morphology/morphology.c
-libvips/morphology/im_label_regions.c
-libvips/morphology/morph_dispatch.c
-libvips/morphology/im_zerox.c
 libvips/morphology/im_cntlines.c
-libvips/morphology/im_rank.c
+libvips/morphology/im_profile.c
+libvips/morphology/morph_dispatch.c
 libvips/morphology/im_rank_image.c
-libvips/mosaicing/mosaicing_dispatch.c
+libvips/morphology/morphology.c
-libvips/mosaicing/im_lrmerge.c
+libvips/morphology/im_zerox.c
-libvips/mosaicing/im_remosaic.c
+libvips/morphology/im_label_regions.c
-libvips/mosaicing/im_tbmosaic.c
+libvips/morphology/im_rank.c
-libvips/mosaicing/im_chkpair.c
-libvips/mosaicing/im_tbcalcon.c
-libvips/mosaicing/global_balance.c
-libvips/mosaicing/im_tbmerge.c
-libvips/mosaicing/im_maxpos_subpel.c
-libvips/mosaicing/im_improve.c
-libvips/mosaicing/im_avgdxdy.c
-libvips/mosaicing/im_align_bands.c
-libvips/mosaicing/im_lrcalcon.c
-libvips/mosaicing/im_initialize.c
-libvips/mosaicing/match.c
 libvips/mosaicing/mosaic1.c
 libvips/mosaicing/im_clinear.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/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/other/im_grey.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_benchmark.c
-libvips/other/im_zone.c
 libvips/other/im_sines.c
-libvips/other/im_eye.c
 libvips/other/im_make_xy.c
-libvips/relational/im_ifthenelse.c
+libvips/other/im_zone.c
+libvips/other/im_eye.c
+libvips/other/im_grey.c
 libvips/relational/relational_dispatch.c
+libvips/relational/im_ifthenelse.c
 libvips/relational/relational.c
 libvips/relational/im_blend.c
-libvips/resample/im_affine.c
-libvips/resample/transform.c
 libvips/resample/im_shrink.c
 libvips/resample/resample_dispatch.c
-libvips/resample/interpolate.c
+libvips/resample/im_affine.c
 libvips/resample/im_rightshift_size.c
+libvips/resample/transform.c
+libvips/resample/interpolate.c
 libvips/video/video_dispatch.c
 libvips/video/im_video_test.c
 libvips/video/im_video_v4l1.c
@@ -261,78 +261,76 @@ tools/vipsthumbnail.c
 libvipsCC/VDisplay.cc
 libvipsCC/VError.cc
 libvipsCC/VImage.cc
-libvipsCC/vipsc++.cc
 libvipsCC/VMask.cc
-libvips/dummy2.cc
+libvips/cimg/dummy2.cc
 libvips/arithmetic/binary.h
 libvips/arithmetic/arithmetic.h
-libvipsCC/include/vips/VDisplay.h
 libvipsCC/include/vips/VImage.h
 libvipsCC/include/vips/vipscpp.h
+libvipsCC/include/vips/VDisplay.h
 libvipsCC/include/vips/VError.h
 libvipsCC/include/vips/VMask.h
-libvipsCC/include/vips/vipsc++.h
 libvips/cimg/CImg.h
 libvips/format/dbh.h
-libvips/include/vips/type.h
-libvips/include/vips/operation.h
-libvips/include/vips/deprecated.h
-libvips/include/vips/image.h
-libvips/include/vips/pool.h
 libvips/include/vips/mosaicing.h
-libvips/include/vips/freq_filt.h
-libvips/include/vips/buf.h
-libvips/include/vips/threadpool.h
-libvips/include/vips/header.h
-libvips/include/vips/inlines.h
-libvips/include/vips/generate.h
-libvips/include/vips/cimg_funcs.h
-libvips/include/vips/object.h
-libvips/include/vips/other.h
-libvips/include/vips/util.h
-libvips/include/vips/inplace.h
-libvips/include/vips/version.h
-libvips/include/vips/private.h
-libvips/include/vips/boolean.h
-libvips/include/vips/conversion.h
-libvips/include/vips/almostdeprecated.h
-libvips/include/vips/resample.h
-libvips/include/vips/dispatch.h
-libvips/include/vips/rect.h
 libvips/include/vips/semaphore.h
-libvips/include/vips/disp.h
+libvips/include/vips/freq_filt.h
-libvips/include/vips/colour.h
+libvips/include/vips/cimg_funcs.h
-libvips/include/vips/enumtypes.h
+libvips/include/vips/operation.h
-libvips/include/vips/vector.h
-libvips/include/vips/intl.h
-libvips/include/vips/region.h
-libvips/include/vips/morphology.h
-libvips/include/vips/format.h
-libvips/include/vips/internal.h
-libvips/include/vips/interpolate.h
-libvips/include/vips/memory.h
-libvips/include/vips/transform.h
-libvips/include/vips/error.h
-libvips/include/vips/convolution.h
-libvips/include/vips/mask.h
 libvips/include/vips/vips.h
+libvips/include/vips/boolean.h
+libvips/include/vips/memory.h
+libvips/include/vips/buf.h
+libvips/include/vips/dispatch.h
 libvips/include/vips/vips7compat.h
-libvips/include/vips/debug.h
+libvips/include/vips/conversion.h
-libvips/include/vips/histograms_lut.h
+libvips/include/vips/inplace.h
-libvips/include/vips/thread.h
 libvips/include/vips/relational.h
-libvips/include/vips/video.h
+libvips/include/vips/mask.h
+libvips/include/vips/rect.h
+libvips/include/vips/generate.h
 libvips/include/vips/arithmetic.h
+libvips/include/vips/version.h
+libvips/include/vips/util.h
+libvips/include/vips/almostdeprecated.h
+libvips/include/vips/colour.h
+libvips/include/vips/threadpool.h
+libvips/include/vips/vector.h
+libvips/include/vips/morphology.h
+libvips/include/vips/error.h
+libvips/include/vips/transform.h
+libvips/include/vips/region.h
+libvips/include/vips/header.h
+libvips/include/vips/image.h
+libvips/include/vips/intl.h
+libvips/include/vips/video.h
+libvips/include/vips/enumtypes.h
+libvips/include/vips/thread.h
+libvips/include/vips/convolution.h
+libvips/include/vips/debug.h
+libvips/include/vips/interpolate.h
+libvips/include/vips/private.h
+libvips/include/vips/format.h
+libvips/include/vips/object.h
+libvips/include/vips/deprecated.h
+libvips/include/vips/inlines.h
+libvips/include/vips/histograms_lut.h
+libvips/include/vips/other.h
+libvips/include/vips/resample.h
+libvips/include/vips/internal.h
+libvips/include/vips/disp.h
+libvips/include/vips/type.h
+libvips/include/vips/pool.h
 libvips/inplace/draw.h
 libvips/iofuncs/sink.h
 libvips/iofuncs/base64.h
+libvips/mosaicing/global_balance.h
 libvips/mosaicing/mosaic.h
 libvips/mosaicing/merge.h
-libvips/mosaicing/global_balance.h
 libvips/resample/templates.h
 libvips/video/im_video_v4l1.h
 libvips/cimg/cimg.cpp
-libvips/resample/bicubic.cpp
-libvips/resample/nohalo.cpp
 libvips/resample/vsqbs.cpp
+libvips/resample/nohalo.cpp
 libvips/resample/lbb.cpp
+libvips/resample/bicubic.cpp