From ae8faf6597c738b5d8adf9f6c29fc7d02203ca44 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 23 Sep 2011 17:12:47 +0100 Subject: [PATCH] remove dmalloc support we never used it and valgrind etc. is better anyway --- ChangeLog | 2 ++ TODO | 10 ++-------- libvips/arithmetic/add.c | 4 ---- libvips/arithmetic/arith_dispatch.c | 4 ---- libvips/arithmetic/arithmetic.c | 4 ---- libvips/arithmetic/avg.c | 4 ---- libvips/arithmetic/binary.c | 4 ---- libvips/arithmetic/im_abs.c | 4 ---- libvips/arithmetic/im_bandmean.c | 4 ---- libvips/arithmetic/im_cross_phase.c | 5 ----- libvips/arithmetic/im_deviate.c | 4 ---- libvips/arithmetic/im_divide.c | 4 ---- libvips/arithmetic/im_invert.c | 4 ---- libvips/arithmetic/im_linreg.c | 4 ---- libvips/arithmetic/im_lintra.c | 4 ---- libvips/arithmetic/im_maxpos.c | 4 ---- libvips/arithmetic/im_maxpos_avg.c | 4 ---- libvips/arithmetic/im_maxpos_vec.c | 4 ---- libvips/arithmetic/im_measure.c | 4 ---- libvips/arithmetic/im_multiply.c | 4 ---- libvips/arithmetic/im_point_bilinear.c | 4 ---- libvips/arithmetic/im_recomb.c | 4 ---- libvips/arithmetic/im_remainder.c | 4 ---- libvips/arithmetic/im_sign.c | 4 ---- libvips/arithmetic/im_stats.c | 4 ---- libvips/arithmetic/math.c | 4 ---- libvips/arithmetic/min.c | 4 ---- libvips/arithmetic/power.c | 4 ---- libvips/arithmetic/round.c | 4 ---- libvips/arithmetic/statistic.c | 4 ---- libvips/arithmetic/subtract.c | 4 ---- libvips/boolean/bool_dispatch.c | 4 ---- libvips/boolean/boolean.c | 4 ---- libvips/cimg/cimg_dispatch.c | 4 ---- libvips/colour/colour.c | 4 ---- libvips/colour/colour_dispatch.c | 4 ---- libvips/colour/derived.c | 4 ---- libvips/colour/disp.c | 4 ---- libvips/colour/im_LCh2Lab.c | 4 ---- libvips/colour/im_LCh2UCS.c | 4 ---- libvips/colour/im_Lab2LCh.c | 4 ---- libvips/colour/im_Lab2LabQ.c | 4 ---- libvips/colour/im_Lab2LabS.c | 4 ---- libvips/colour/im_Lab2XYZ.c | 4 ---- libvips/colour/im_LabQ2Lab.c | 4 ---- libvips/colour/im_LabQ2LabS.c | 4 ---- libvips/colour/im_LabQ2disp.c | 4 ---- libvips/colour/im_LabS2Lab.c | 4 ---- libvips/colour/im_LabS2LabQ.c | 4 ---- libvips/colour/im_UCS2LCh.c | 4 ---- libvips/colour/im_XYZ2Lab.c | 4 ---- libvips/colour/im_XYZ2Yxy.c | 4 ---- libvips/colour/im_XYZ2disp.c | 4 ---- libvips/colour/im_Yxy2XYZ.c | 4 ---- libvips/colour/im_dE00_fromLab.c | 4 ---- libvips/colour/im_dECMC_fromLab.c | 4 ---- libvips/colour/im_dE_fromLab.c | 4 ---- libvips/colour/im_disp2XYZ.c | 4 ---- libvips/colour/im_float2rad.c | 4 ---- libvips/colour/im_icc_transform.c | 8 -------- libvips/colour/im_lab_morph.c | 4 ---- libvips/colour/im_rad2float.c | 4 ---- libvips/conversion/conver_dispatch.c | 4 ---- libvips/conversion/im_black.c | 4 ---- libvips/conversion/im_c2amph.c | 4 ---- libvips/conversion/im_c2imag.c | 4 ---- libvips/conversion/im_c2real.c | 4 ---- libvips/conversion/im_c2rect.c | 4 ---- libvips/conversion/im_clip2fmt.c | 4 ---- libvips/conversion/im_copy.c | 4 ---- libvips/conversion/im_copy_file.c | 4 ---- libvips/conversion/im_embed.c | 4 ---- libvips/conversion/im_extract.c | 4 ---- libvips/conversion/im_falsecolour.c | 4 ---- libvips/conversion/im_fliphor.c | 4 ---- libvips/conversion/im_flipver.c | 4 ---- libvips/conversion/im_gaussnoise.c | 4 ---- libvips/conversion/im_gbandjoin.c | 4 ---- libvips/conversion/im_grid.c | 4 ---- libvips/conversion/im_insert.c | 4 ---- libvips/conversion/im_lrjoin.c | 4 ---- libvips/conversion/im_mask2vips.c | 4 ---- libvips/conversion/im_msb.c | 4 ---- libvips/conversion/im_replicate.c | 4 ---- libvips/conversion/im_ri2c.c | 4 ---- libvips/conversion/im_rot180.c | 4 ---- libvips/conversion/im_rot270.c | 4 ---- libvips/conversion/im_rot90.c | 4 ---- libvips/conversion/im_scale.c | 4 ---- libvips/conversion/im_scaleps.c | 4 ---- libvips/conversion/im_subsample.c | 4 ---- libvips/conversion/im_system.c | 4 ---- libvips/conversion/im_system_image.c | 4 ---- libvips/conversion/im_tbjoin.c | 4 ---- libvips/conversion/im_text.c | 4 ---- libvips/conversion/im_vips2mask.c | 4 ---- libvips/conversion/im_wrap.c | 4 ---- libvips/conversion/im_zoom.c | 4 ---- libvips/convolution/convol_dispatch.c | 4 ---- libvips/convolution/im_aconv.c | 4 ---- libvips/convolution/im_aconvsep.c | 4 ---- libvips/convolution/im_addgnoise.c | 4 ---- libvips/convolution/im_compass.c | 4 ---- libvips/convolution/im_contrast_surface.c | 4 ---- libvips/convolution/im_conv.c | 4 ---- libvips/convolution/im_conv_f.c | 4 ---- libvips/convolution/im_fastcor.c | 4 ---- libvips/convolution/im_gradcor.c | 4 ---- libvips/convolution/im_sharpen.c | 4 ---- libvips/convolution/im_spcor.c | 4 ---- libvips/deprecated/cooc_funcs.c | 4 ---- libvips/deprecated/deprecated_dispatch.c | 4 ---- libvips/deprecated/dispatch_types.c | 4 ---- libvips/deprecated/glds_funcs.c | 4 ---- libvips/deprecated/im_bernd.c | 4 ---- libvips/deprecated/im_clamp.c | 4 ---- libvips/deprecated/im_cmulnorm.c | 4 ---- libvips/deprecated/im_convsub.c | 4 ---- libvips/deprecated/im_debugim.c | 4 ---- libvips/deprecated/im_dif_std.c | 4 ---- libvips/deprecated/im_fav4.c | 4 ---- libvips/deprecated/im_gadd.c | 4 ---- libvips/deprecated/im_gaddim.c | 4 ---- libvips/deprecated/im_gfadd.c | 4 ---- libvips/deprecated/im_line.c | 4 ---- libvips/deprecated/im_litecor.c | 4 ---- libvips/deprecated/im_print.c | 4 ---- libvips/deprecated/im_printlines.c | 4 ---- libvips/deprecated/im_resize_linear.c | 4 ---- libvips/deprecated/im_setbox.c | 4 ---- libvips/deprecated/im_simcontr.c | 4 ---- libvips/deprecated/im_slice.c | 4 ---- libvips/deprecated/im_spatres.c | 4 ---- libvips/deprecated/im_stretch3.c | 4 ---- libvips/deprecated/im_thresh.c | 4 ---- libvips/deprecated/package.c | 4 ---- libvips/deprecated/rename.c | 4 ---- libvips/deprecated/vips7compat.c | 4 ---- libvips/deprecated/wrapvips7.c | 4 ---- libvips/format/fits.c | 4 ---- libvips/format/format.c | 4 ---- libvips/format/format_dispatch.c | 4 ---- libvips/format/im_analyze2vips.c | 4 ---- libvips/format/im_csv2vips.c | 4 ---- libvips/format/im_exr2vips.c | 4 ---- libvips/format/im_jpeg2vips.c | 4 ---- libvips/format/im_magick2vips.c | 4 ---- libvips/format/im_png2vips.c | 4 ---- libvips/format/im_ppm2vips.c | 4 ---- libvips/format/im_raw2vips.c | 4 ---- libvips/format/im_tiff2vips.c | 4 ---- libvips/format/im_tile_cache.c | 4 ---- libvips/format/im_vips2csv.c | 4 ---- libvips/format/im_vips2jpeg.c | 4 ---- libvips/format/im_vips2png.c | 4 ---- libvips/format/im_vips2ppm.c | 4 ---- libvips/format/im_vips2raw.c | 4 ---- libvips/format/im_vips2tiff.c | 4 ---- libvips/format/matlab.c | 4 ---- libvips/format/radiance.c | 4 ---- libvips/freq_filt/fft_sp.c | 4 ---- libvips/freq_filt/fmask4th.c | 4 ---- libvips/freq_filt/fmaskcir.c | 4 ---- libvips/freq_filt/freq_dispatch.c | 4 ---- libvips/freq_filt/im_disp_ps.c | 4 ---- libvips/freq_filt/im_fractsurf.c | 4 ---- libvips/freq_filt/im_freq_mask.c | 4 ---- libvips/freq_filt/im_freqflt.c | 4 ---- libvips/freq_filt/im_fwfft.c | 4 ---- libvips/freq_filt/im_invfft.c | 4 ---- libvips/freq_filt/im_invfftr.c | 4 ---- libvips/freq_filt/im_phasecor_fft.c | 4 ---- libvips/freq_filt/im_rotquad.c | 4 ---- libvips/histograms_lut/hist_dispatch.c | 4 ---- libvips/histograms_lut/im_buildlut.c | 4 ---- libvips/histograms_lut/im_gammacorrect.c | 4 ---- libvips/histograms_lut/im_heq.c | 4 ---- libvips/histograms_lut/im_hist.c | 4 ---- libvips/histograms_lut/im_histeq.c | 4 ---- libvips/histograms_lut/im_histgr.c | 4 ---- libvips/histograms_lut/im_histindexed.c | 4 ---- libvips/histograms_lut/im_histnD.c | 4 ---- libvips/histograms_lut/im_histplot.c | 4 ---- libvips/histograms_lut/im_histspec.c | 4 ---- libvips/histograms_lut/im_hsp.c | 4 ---- libvips/histograms_lut/im_identity.c | 4 ---- libvips/histograms_lut/im_invertlut.c | 4 ---- libvips/histograms_lut/im_lhisteq.c | 4 ---- libvips/histograms_lut/im_maplut.c | 4 ---- libvips/histograms_lut/im_mpercent.c | 4 ---- libvips/histograms_lut/im_project.c | 4 ---- libvips/histograms_lut/im_stdif.c | 4 ---- libvips/histograms_lut/tone.c | 4 ---- libvips/inplace/draw.c | 4 ---- libvips/inplace/flood.c | 4 ---- libvips/inplace/im_draw_circle.c | 4 ---- libvips/inplace/im_draw_image.c | 4 ---- libvips/inplace/im_draw_line.c | 4 ---- libvips/inplace/im_draw_mask.c | 4 ---- libvips/inplace/im_draw_point.c | 4 ---- libvips/inplace/im_draw_rect.c | 4 ---- libvips/inplace/im_draw_smudge.c | 4 ---- libvips/inplace/inplace_dispatch.c | 4 ---- libvips/iofuncs/base64.c | 4 ---- libvips/iofuncs/buf.c | 4 ---- libvips/iofuncs/buffer.c | 4 ---- libvips/iofuncs/cache.c | 4 ---- libvips/iofuncs/error.c | 4 ---- libvips/iofuncs/generate.c | 4 ---- libvips/iofuncs/header.c | 4 ---- libvips/iofuncs/image.c | 4 ---- libvips/iofuncs/init.c | 4 ---- libvips/iofuncs/mapfile.c | 4 ---- libvips/iofuncs/memory.c | 4 ---- libvips/iofuncs/object.c | 4 ---- libvips/iofuncs/operation.c | 4 ---- libvips/iofuncs/pool.c | 4 ---- libvips/iofuncs/rect.c | 4 ---- libvips/iofuncs/region.c | 4 ---- libvips/iofuncs/semaphore.c | 4 ---- libvips/iofuncs/sink.c | 4 ---- libvips/iofuncs/sinkdisc.c | 4 ---- libvips/iofuncs/sinkmemory.c | 4 ---- libvips/iofuncs/sinkscreen.c | 4 ---- libvips/iofuncs/threadpool.c | 4 ---- libvips/iofuncs/util.c | 4 ---- libvips/iofuncs/vector.c | 4 ---- libvips/iofuncs/vips.c | 4 ---- libvips/iofuncs/window.c | 4 ---- libvips/mask/im_gaussmasks.c | 4 ---- libvips/mask/im_logmasks.c | 4 ---- libvips/mask/im_matcat.c | 4 ---- libvips/mask/im_matinv.c | 4 ---- libvips/mask/im_matmul.c | 4 ---- libvips/mask/im_mattrn.c | 4 ---- libvips/mask/mask_dispatch.c | 4 ---- libvips/mask/matalloc.c | 4 ---- libvips/mask/rotmask.c | 4 ---- libvips/mask/rw_mask.c | 4 ---- libvips/morphology/im_cntlines.c | 4 ---- libvips/morphology/im_label_regions.c | 4 ---- libvips/morphology/im_profile.c | 4 ---- libvips/morphology/im_rank.c | 4 ---- libvips/morphology/im_rank_image.c | 4 ---- libvips/morphology/im_zerox.c | 4 ---- libvips/morphology/morph_dispatch.c | 4 ---- libvips/morphology/morphology.c | 4 ---- libvips/mosaicing/global_balance.c | 4 ---- libvips/mosaicing/im_align_bands.c | 4 ---- libvips/mosaicing/im_avgdxdy.c | 4 ---- libvips/mosaicing/im_chkpair.c | 4 ---- libvips/mosaicing/im_clinear.c | 4 ---- libvips/mosaicing/im_improve.c | 4 ---- libvips/mosaicing/im_initialize.c | 4 ---- libvips/mosaicing/im_lrcalcon.c | 4 ---- libvips/mosaicing/im_lrmerge.c | 4 ---- libvips/mosaicing/im_lrmosaic.c | 4 ---- libvips/mosaicing/im_maxpos_subpel.c | 4 ---- libvips/mosaicing/im_remosaic.c | 4 ---- libvips/mosaicing/im_tbcalcon.c | 4 ---- libvips/mosaicing/im_tbmerge.c | 4 ---- libvips/mosaicing/im_tbmosaic.c | 4 ---- libvips/mosaicing/match.c | 4 ---- libvips/mosaicing/mosaic1.c | 4 ---- libvips/mosaicing/mosaicing_dispatch.c | 4 ---- libvips/other/im_benchmark.c | 4 ---- libvips/other/im_eye.c | 4 ---- libvips/other/im_grey.c | 4 ---- libvips/other/im_make_xy.c | 4 ---- libvips/other/im_sines.c | 4 ---- libvips/other/im_zone.c | 4 ---- libvips/other/other_dispatch.c | 4 ---- libvips/relational/im_blend.c | 4 ---- libvips/relational/im_ifthenelse.c | 4 ---- libvips/relational/relational.c | 4 ---- libvips/relational/relational_dispatch.c | 4 ---- libvips/resample/im_affine.c | 4 ---- libvips/resample/im_rightshift_size.c | 4 ---- libvips/resample/im_shrink.c | 4 ---- libvips/resample/interpolate.c | 4 ---- libvips/resample/resample_dispatch.c | 4 ---- libvips/resample/transform.c | 4 ---- libvips/video/im_video_test.c | 4 ---- libvips/video/im_video_v4l1.c | 4 ---- libvips/video/video_dispatch.c | 4 ---- 285 files changed, 4 insertions(+), 1145 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50810f00..828d2734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ - add the operation cache - fallback vips_init() - vips_tracked_malloc() tracks allocation size and can report total mem usage +- cache limits, drop, init, flush plus command-line controls +- remove dmalloc support, was never used and valgrind is better 10/8/11 started 7.26.3 - don't use G_VALUE_COLLECT_INIT(), many platforms do not have a glib this diff --git a/TODO b/TODO index 52838dad..cbce91e0 100644 --- a/TODO +++ b/TODO @@ -1,23 +1,17 @@ -- get rid of useless DMALLOC stuff - - #ifdef WITH_DMALLOC - #include - #endif /*WITH_DMALLOC*/ - - - - do clip/embed etc. in new style, good to get everything that VipsAdd uses in the new stack + - im_csv2vips() gets confused by quotes and commas, eg. NP_001121179.1,"serine proteinase inhibitor, clade A, member ",ITPNLAEFAFSLYR,0.95588235294118,0.96176470588235, ... + - add vips_init_argv() which processes argc/argv for you? handy for tiny progs, perhaps diff --git a/libvips/arithmetic/add.c b/libvips/arithmetic/add.c index d0b79b41..b8e53481 100644 --- a/libvips/arithmetic/add.c +++ b/libvips/arithmetic/add.c @@ -82,10 +82,6 @@ #include "arithmetic.h" #include "binary.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * VipsAdd: * @in1: input image diff --git a/libvips/arithmetic/arith_dispatch.c b/libvips/arithmetic/arith_dispatch.c index fa56d239..bfa95c75 100644 --- a/libvips/arithmetic/arith_dispatch.c +++ b/libvips/arithmetic/arith_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: arithmetic * @short_description: operations which perform pixel arithmetic, trig, log, statistics diff --git a/libvips/arithmetic/arithmetic.c b/libvips/arithmetic/arithmetic.c index 256684d9..738fb948 100644 --- a/libvips/arithmetic/arithmetic.c +++ b/libvips/arithmetic/arithmetic.c @@ -53,10 +53,6 @@ #include "arithmetic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Properties. */ enum { diff --git a/libvips/arithmetic/avg.c b/libvips/arithmetic/avg.c index 1c9672a5..beddd718 100644 --- a/libvips/arithmetic/avg.c +++ b/libvips/arithmetic/avg.c @@ -74,10 +74,6 @@ #include "statistic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * VipsAvg: * @in: input #VipsImage diff --git a/libvips/arithmetic/binary.c b/libvips/arithmetic/binary.c index b29a2b29..3cc8ccbb 100644 --- a/libvips/arithmetic/binary.c +++ b/libvips/arithmetic/binary.c @@ -50,10 +50,6 @@ #include "arithmetic.h" #include "binary.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Properties. */ enum { diff --git a/libvips/arithmetic/im_abs.c b/libvips/arithmetic/im_abs.c index 60db6148..212e145a 100644 --- a/libvips/arithmetic/im_abs.c +++ b/libvips/arithmetic/im_abs.c @@ -62,10 +62,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Integer abs operation: just test and negate. */ #define intabs(TYPE) { \ diff --git a/libvips/arithmetic/im_bandmean.c b/libvips/arithmetic/im_bandmean.c index f4d674fe..10f35c4c 100644 --- a/libvips/arithmetic/im_bandmean.c +++ b/libvips/arithmetic/im_bandmean.c @@ -45,10 +45,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Int types. Round, keep sum in a larger variable. */ #define ILOOP( TYPE, STYPE ) { \ diff --git a/libvips/arithmetic/im_cross_phase.c b/libvips/arithmetic/im_cross_phase.c index 7e742887..c16fba1b 100644 --- a/libvips/arithmetic/im_cross_phase.c +++ b/libvips/arithmetic/im_cross_phase.c @@ -48,11 +48,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - - /* There doesn't seem to be much difference in speed between these two methods (on an Athlon64), * so I use the modulus argument version, since atan2() is in c89 but hypot() is c99. * diff --git a/libvips/arithmetic/im_deviate.c b/libvips/arithmetic/im_deviate.c index bddc3e3f..ae66e08a 100644 --- a/libvips/arithmetic/im_deviate.c +++ b/libvips/arithmetic/im_deviate.c @@ -69,10 +69,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - typedef struct _Wrapscan { IMAGE *in; im_start_fn start; diff --git a/libvips/arithmetic/im_divide.c b/libvips/arithmetic/im_divide.c index d4df96b0..ac2b0f5c 100644 --- a/libvips/arithmetic/im_divide.c +++ b/libvips/arithmetic/im_divide.c @@ -67,10 +67,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Complex divide. */ #ifdef USE_MODARG_DIV diff --git a/libvips/arithmetic/im_invert.c b/libvips/arithmetic/im_invert.c index d1ec4a25..49b6d631 100644 --- a/libvips/arithmetic/im_invert.c +++ b/libvips/arithmetic/im_invert.c @@ -50,10 +50,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Invert a REGION. We are given the REGION we should write to, the REGION we * should use for input, and the IMAGE we are processing. On entry to * invert_gen(), or points to the memory we should write to and ir is blank. diff --git a/libvips/arithmetic/im_linreg.c b/libvips/arithmetic/im_linreg.c index cfbe42dd..d4626b00 100644 --- a/libvips/arithmetic/im_linreg.c +++ b/libvips/arithmetic/im_linreg.c @@ -50,10 +50,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC */ - /** TYPES **/ diff --git a/libvips/arithmetic/im_lintra.c b/libvips/arithmetic/im_lintra.c index 5f0f3092..a20d8495 100644 --- a/libvips/arithmetic/im_lintra.c +++ b/libvips/arithmetic/im_lintra.c @@ -75,10 +75,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Struct we need for im_generate(). */ typedef struct { diff --git a/libvips/arithmetic/im_maxpos.c b/libvips/arithmetic/im_maxpos.c index 1125aa7b..2d014b81 100644 --- a/libvips/arithmetic/im_maxpos.c +++ b/libvips/arithmetic/im_maxpos.c @@ -59,10 +59,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Get the value of pixel (0, 0). Use this to init the min/max value for * im_max()/im_stats()/etc. */ diff --git a/libvips/arithmetic/im_maxpos_avg.c b/libvips/arithmetic/im_maxpos_avg.c index ad3346f9..cc691523 100644 --- a/libvips/arithmetic/im_maxpos_avg.c +++ b/libvips/arithmetic/im_maxpos_avg.c @@ -59,10 +59,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* A position and maximum. */ typedef struct _Maxposavg { diff --git a/libvips/arithmetic/im_maxpos_vec.c b/libvips/arithmetic/im_maxpos_vec.c index d3f7b30f..256615d5 100644 --- a/libvips/arithmetic/im_maxpos_vec.c +++ b/libvips/arithmetic/im_maxpos_vec.c @@ -49,10 +49,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC */ - /** TYPE DEFINITIONS **/ diff --git a/libvips/arithmetic/im_measure.c b/libvips/arithmetic/im_measure.c index b3e12d6a..6f76f544 100644 --- a/libvips/arithmetic/im_measure.c +++ b/libvips/arithmetic/im_measure.c @@ -57,10 +57,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Measure into array. */ static int diff --git a/libvips/arithmetic/im_multiply.c b/libvips/arithmetic/im_multiply.c index 5fe0631c..02f4f4c5 100644 --- a/libvips/arithmetic/im_multiply.c +++ b/libvips/arithmetic/im_multiply.c @@ -65,10 +65,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Complex multiply. */ #define CLOOP( TYPE ) { \ diff --git a/libvips/arithmetic/im_point_bilinear.c b/libvips/arithmetic/im_point_bilinear.c index 4bf818ea..1a76a680 100644 --- a/libvips/arithmetic/im_point_bilinear.c +++ b/libvips/arithmetic/im_point_bilinear.c @@ -45,10 +45,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC */ - /** * im_point: * @im: image to read from diff --git a/libvips/arithmetic/im_recomb.c b/libvips/arithmetic/im_recomb.c index ca6c8e1c..75ccdcf0 100644 --- a/libvips/arithmetic/im_recomb.c +++ b/libvips/arithmetic/im_recomb.c @@ -41,10 +41,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Inner loop. */ #define LOOP( IN, OUT ) { \ diff --git a/libvips/arithmetic/im_remainder.c b/libvips/arithmetic/im_remainder.c index 531d2d74..976840b8 100644 --- a/libvips/arithmetic/im_remainder.c +++ b/libvips/arithmetic/im_remainder.c @@ -56,10 +56,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Integer remainder-after-division. */ #define IREMAINDER( TYPE ) { \ diff --git a/libvips/arithmetic/im_sign.c b/libvips/arithmetic/im_sign.c index 88b28b2f..c6875ef9 100644 --- a/libvips/arithmetic/im_sign.c +++ b/libvips/arithmetic/im_sign.c @@ -44,10 +44,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define CSIGN( IN, OUT ) { \ IN *p = (IN *) in; \ OUT *q = (OUT *) out; \ diff --git a/libvips/arithmetic/im_stats.c b/libvips/arithmetic/im_stats.c index c7aa6254..cbf80150 100644 --- a/libvips/arithmetic/im_stats.c +++ b/libvips/arithmetic/im_stats.c @@ -68,10 +68,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Track min/max/sum/sum-of-squares for each thread during a scan. */ static void * diff --git a/libvips/arithmetic/math.c b/libvips/arithmetic/math.c index d6127cae..94084415 100644 --- a/libvips/arithmetic/math.c +++ b/libvips/arithmetic/math.c @@ -61,10 +61,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* What we do for each band element. Non-complex only. */ #define FUN_LOOP( IN, OUT, FUN ) { \ diff --git a/libvips/arithmetic/min.c b/libvips/arithmetic/min.c index 71484dd9..7fef11f4 100644 --- a/libvips/arithmetic/min.c +++ b/libvips/arithmetic/min.c @@ -66,10 +66,6 @@ #include "statistic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * VipsMin: * @in: input #VipsImage diff --git a/libvips/arithmetic/power.c b/libvips/arithmetic/power.c index a37ca26d..3e86afcb 100644 --- a/libvips/arithmetic/power.c +++ b/libvips/arithmetic/power.c @@ -59,10 +59,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Operator with a single constant. */ #define CONST1( IN, OUT, FUN ) { \ diff --git a/libvips/arithmetic/round.c b/libvips/arithmetic/round.c index 7f197613..d59546b2 100644 --- a/libvips/arithmetic/round.c +++ b/libvips/arithmetic/round.c @@ -46,10 +46,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define ROUND_LOOP( TYPE, FUN ) { \ TYPE *p = (TYPE *) in; \ TYPE *q = (TYPE *) out; \ diff --git a/libvips/arithmetic/statistic.c b/libvips/arithmetic/statistic.c index 3a67f6b5..6acb6bcd 100644 --- a/libvips/arithmetic/statistic.c +++ b/libvips/arithmetic/statistic.c @@ -52,10 +52,6 @@ #include "statistic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Properties. */ enum { diff --git a/libvips/arithmetic/subtract.c b/libvips/arithmetic/subtract.c index 0d70eae6..89406dd9 100644 --- a/libvips/arithmetic/subtract.c +++ b/libvips/arithmetic/subtract.c @@ -77,10 +77,6 @@ #include "arithmetic.h" #include "binary.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * VipsSubtract: * @in1: input image diff --git a/libvips/boolean/bool_dispatch.c b/libvips/boolean/bool_dispatch.c index 5af60cab..b05ecfd6 100644 --- a/libvips/boolean/bool_dispatch.c +++ b/libvips/boolean/bool_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: boolean * @short_description: boolean algebra on images, bitshifts diff --git a/libvips/boolean/boolean.c b/libvips/boolean/boolean.c index 9442ad12..76cdadd2 100644 --- a/libvips/boolean/boolean.c +++ b/libvips/boolean/boolean.c @@ -68,10 +68,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Save a bit of typing. */ #define UC IM_BANDFMT_UCHAR diff --git a/libvips/cimg/cimg_dispatch.c b/libvips/cimg/cimg_dispatch.c index 371fee61..59d060d2 100644 --- a/libvips/cimg/cimg_dispatch.c +++ b/libvips/cimg/cimg_dispatch.c @@ -36,10 +36,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: cimg_funcs * @short_description: expose operations from the CImg library, mostly noise diff --git a/libvips/colour/colour.c b/libvips/colour/colour.c index fcc17ae2..93c2d6f5 100644 --- a/libvips/colour/colour.c +++ b/libvips/colour/colour.c @@ -67,10 +67,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Have the tables been made? */ static int made_ucs_tables = 0; diff --git a/libvips/colour/colour_dispatch.c b/libvips/colour/colour_dispatch.c index 7e8b242a..4534bd2d 100644 --- a/libvips/colour/colour_dispatch.c +++ b/libvips/colour/colour_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: colour * @short_description: colour operators diff --git a/libvips/colour/derived.c b/libvips/colour/derived.c index a7158230..924594b9 100644 --- a/libvips/colour/derived.c +++ b/libvips/colour/derived.c @@ -47,10 +47,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_LabQ2XYZ: * @in: input image diff --git a/libvips/colour/disp.c b/libvips/colour/disp.c index 0cfc1522..0fdb79bc 100644 --- a/libvips/colour/disp.c +++ b/libvips/colour/disp.c @@ -45,10 +45,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Tables we've generated, indexed by display name. */ static GHashTable *im__col_display_tables = NULL; diff --git a/libvips/colour/im_LCh2Lab.c b/libvips/colour/im_LCh2Lab.c index bd5f0781..3ac7c3d9 100644 --- a/libvips/colour/im_LCh2Lab.c +++ b/libvips/colour/im_LCh2Lab.c @@ -48,10 +48,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Process a buffer of data. */ void diff --git a/libvips/colour/im_LCh2UCS.c b/libvips/colour/im_LCh2UCS.c index d963cac0..7bf82678 100644 --- a/libvips/colour/im_LCh2UCS.c +++ b/libvips/colour/im_LCh2UCS.c @@ -42,10 +42,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Our main loop. */ void diff --git a/libvips/colour/im_Lab2LCh.c b/libvips/colour/im_Lab2LCh.c index adf3dcd5..f87472ac 100644 --- a/libvips/colour/im_Lab2LCh.c +++ b/libvips/colour/im_Lab2LCh.c @@ -41,10 +41,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Our main loop. */ void diff --git a/libvips/colour/im_Lab2LabQ.c b/libvips/colour/im_Lab2LabQ.c index 2b755588..66d2139c 100644 --- a/libvips/colour/im_Lab2LabQ.c +++ b/libvips/colour/im_Lab2LabQ.c @@ -66,10 +66,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* @(#) convert float Lab to packed Lab32 format 10 11 11 bits * works only on buffers, not IMAGEs * Copyright 1993 K.Martinez diff --git a/libvips/colour/im_Lab2LabS.c b/libvips/colour/im_Lab2LabS.c index ad746324..2a4e14c2 100644 --- a/libvips/colour/im_Lab2LabS.c +++ b/libvips/colour/im_Lab2LabS.c @@ -43,10 +43,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - void imb_Lab2LabS( float *in, signed short *out, int n ) { diff --git a/libvips/colour/im_Lab2XYZ.c b/libvips/colour/im_Lab2XYZ.c index e3d41993..37417525 100644 --- a/libvips/colour/im_Lab2XYZ.c +++ b/libvips/colour/im_Lab2XYZ.c @@ -52,10 +52,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Process a buffer of data. */ void diff --git a/libvips/colour/im_LabQ2Lab.c b/libvips/colour/im_LabQ2Lab.c index efc0753d..d059a838 100644 --- a/libvips/colour/im_LabQ2Lab.c +++ b/libvips/colour/im_LabQ2Lab.c @@ -53,10 +53,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* imb_LabQ2Lab: CONVERT n pels from packed 32bit Lab to float values * in a buffer * ARGS: PEL *inp pointer to first byte of Lab32 buffer diff --git a/libvips/colour/im_LabQ2LabS.c b/libvips/colour/im_LabQ2LabS.c index 1a71ca00..1ee70934 100644 --- a/libvips/colour/im_LabQ2LabS.c +++ b/libvips/colour/im_LabQ2LabS.c @@ -45,10 +45,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* CONVERT n pels from packed 32bit Lab to signed short. */ void diff --git a/libvips/colour/im_LabQ2disp.c b/libvips/colour/im_LabQ2disp.c index 88865f93..6839ded7 100644 --- a/libvips/colour/im_LabQ2disp.c +++ b/libvips/colour/im_LabQ2disp.c @@ -46,10 +46,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Hold a display characterisation, and a set of tables * computed from that. */ diff --git a/libvips/colour/im_LabS2Lab.c b/libvips/colour/im_LabS2Lab.c index 554ef43c..2f201bb0 100644 --- a/libvips/colour/im_LabS2Lab.c +++ b/libvips/colour/im_LabS2Lab.c @@ -41,10 +41,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Convert n pels from signed short to Lab. */ void diff --git a/libvips/colour/im_LabS2LabQ.c b/libvips/colour/im_LabS2LabQ.c index 507b185a..4c6df05b 100644 --- a/libvips/colour/im_LabS2LabQ.c +++ b/libvips/colour/im_LabS2LabQ.c @@ -50,10 +50,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Convert n pels from signed short to IM_CODING_LABQ. */ void diff --git a/libvips/colour/im_UCS2LCh.c b/libvips/colour/im_UCS2LCh.c index 28a8f601..8fd294ff 100644 --- a/libvips/colour/im_UCS2LCh.c +++ b/libvips/colour/im_UCS2LCh.c @@ -48,10 +48,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Process a buffer of data. */ void diff --git a/libvips/colour/im_XYZ2Lab.c b/libvips/colour/im_XYZ2Lab.c index 7a5892f4..ad7f42e4 100644 --- a/libvips/colour/im_XYZ2Lab.c +++ b/libvips/colour/im_XYZ2Lab.c @@ -57,10 +57,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #ifndef HAVE_CBRT #define cbrt( X ) pow( (X), 1.0 / 3.0 ) #endif /*!HAVE_CBRT*/ diff --git a/libvips/colour/im_XYZ2Yxy.c b/libvips/colour/im_XYZ2Yxy.c index 2c6f6bb7..05a3c2be 100644 --- a/libvips/colour/im_XYZ2Yxy.c +++ b/libvips/colour/im_XYZ2Yxy.c @@ -45,10 +45,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Process a buffer of data. */ void diff --git a/libvips/colour/im_XYZ2disp.c b/libvips/colour/im_XYZ2disp.c index d58962fe..41183190 100644 --- a/libvips/colour/im_XYZ2disp.c +++ b/libvips/colour/im_XYZ2disp.c @@ -62,10 +62,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Process a buffer of data. */ void diff --git a/libvips/colour/im_Yxy2XYZ.c b/libvips/colour/im_Yxy2XYZ.c index 62ecd945..7a55deb1 100644 --- a/libvips/colour/im_Yxy2XYZ.c +++ b/libvips/colour/im_Yxy2XYZ.c @@ -45,10 +45,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Process a buffer of data. */ void diff --git a/libvips/colour/im_dE00_fromLab.c b/libvips/colour/im_dE00_fromLab.c index e565498d..c3f4ad79 100644 --- a/libvips/colour/im_dE00_fromLab.c +++ b/libvips/colour/im_dE00_fromLab.c @@ -41,10 +41,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* A colour difference operation. */ int diff --git a/libvips/colour/im_dECMC_fromLab.c b/libvips/colour/im_dECMC_fromLab.c index fe2601c5..f450a715 100644 --- a/libvips/colour/im_dECMC_fromLab.c +++ b/libvips/colour/im_dECMC_fromLab.c @@ -41,10 +41,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Process a buffer. */ void diff --git a/libvips/colour/im_dE_fromLab.c b/libvips/colour/im_dE_fromLab.c index 179a3fe9..5e208ffc 100644 --- a/libvips/colour/im_dE_fromLab.c +++ b/libvips/colour/im_dE_fromLab.c @@ -42,10 +42,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Find the difference between two buffers of LAB data. */ void diff --git a/libvips/colour/im_disp2XYZ.c b/libvips/colour/im_disp2XYZ.c index 92a6d969..ddfcccfb 100644 --- a/libvips/colour/im_disp2XYZ.c +++ b/libvips/colour/im_disp2XYZ.c @@ -52,10 +52,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Convert a buffer. */ void diff --git a/libvips/colour/im_float2rad.c b/libvips/colour/im_float2rad.c index c131bcbb..d9882d73 100644 --- a/libvips/colour/im_float2rad.c +++ b/libvips/colour/im_float2rad.c @@ -106,10 +106,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Begin copy-paste from Radiance sources. */ diff --git a/libvips/colour/im_icc_transform.c b/libvips/colour/im_icc_transform.c index 76cac4c2..1d7a72c3 100644 --- a/libvips/colour/im_icc_transform.c +++ b/libvips/colour/im_icc_transform.c @@ -68,10 +68,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * VipsIntent: * @IM_INTENT_PERCEPTUAL: @@ -875,10 +871,6 @@ im_icc_ac2rc( IMAGE *in, IMAGE *out, const char *profile_filename ) #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * VipsIntent: * @IM_INTENT_PERCEPTUAL: perceptual rendering intent diff --git a/libvips/colour/im_lab_morph.c b/libvips/colour/im_lab_morph.c index 1eb97ed7..10020892 100644 --- a/libvips/colour/im_lab_morph.c +++ b/libvips/colour/im_lab_morph.c @@ -46,10 +46,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - typedef struct { IMAGE *in, *out; diff --git a/libvips/colour/im_rad2float.c b/libvips/colour/im_rad2float.c index 5ee834a5..c8010a5d 100644 --- a/libvips/colour/im_rad2float.c +++ b/libvips/colour/im_rad2float.c @@ -105,10 +105,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Begin copy-paste from Radiance sources. */ diff --git a/libvips/conversion/conver_dispatch.c b/libvips/conversion/conver_dispatch.c index c2e0975e..9ae9bd71 100644 --- a/libvips/conversion/conver_dispatch.c +++ b/libvips/conversion/conver_dispatch.c @@ -36,10 +36,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: conversion * @short_description: convert images in some way: change band format, change header, insert, extract, join diff --git a/libvips/conversion/im_black.c b/libvips/conversion/im_black.c index a2fa068b..a0b75a97 100644 --- a/libvips/conversion/im_black.c +++ b/libvips/conversion/im_black.c @@ -52,10 +52,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Generate function --- just black out the region. */ static int diff --git a/libvips/conversion/im_c2amph.c b/libvips/conversion/im_c2amph.c index 4dbf33ee..bd49af0c 100644 --- a/libvips/conversion/im_c2amph.c +++ b/libvips/conversion/im_c2amph.c @@ -56,10 +56,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define loop(TYPE) { \ TYPE *p = (TYPE *) in; \ TYPE *q = (TYPE *) out; \ diff --git a/libvips/conversion/im_c2imag.c b/libvips/conversion/im_c2imag.c index 149d70a1..43e8eb63 100644 --- a/libvips/conversion/im_c2imag.c +++ b/libvips/conversion/im_c2imag.c @@ -49,10 +49,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define loop(TYPE) { \ TYPE *p = (TYPE *) in + 1; \ TYPE *q = (TYPE *) out; \ diff --git a/libvips/conversion/im_c2real.c b/libvips/conversion/im_c2real.c index 448d7647..b7887e82 100644 --- a/libvips/conversion/im_c2real.c +++ b/libvips/conversion/im_c2real.c @@ -55,10 +55,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define loop(TYPE) { \ TYPE *p = (TYPE *) in; \ TYPE *q = (TYPE *) out; \ diff --git a/libvips/conversion/im_c2rect.c b/libvips/conversion/im_c2rect.c index 99e17e73..bc088695 100644 --- a/libvips/conversion/im_c2rect.c +++ b/libvips/conversion/im_c2rect.c @@ -44,10 +44,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define loop(TYPE) { \ TYPE *p = (TYPE *) in; \ TYPE *q = (TYPE *) out; \ diff --git a/libvips/conversion/im_clip2fmt.c b/libvips/conversion/im_clip2fmt.c index afc70a2c..7a8b99e1 100644 --- a/libvips/conversion/im_clip2fmt.c +++ b/libvips/conversion/im_clip2fmt.c @@ -83,10 +83,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Global state. Track over/under-flows for all sequences in this. */ typedef struct { diff --git a/libvips/conversion/im_copy.c b/libvips/conversion/im_copy.c index 82d13d10..f37ee87a 100644 --- a/libvips/conversion/im_copy.c +++ b/libvips/conversion/im_copy.c @@ -83,10 +83,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Copy a small area. */ static int diff --git a/libvips/conversion/im_copy_file.c b/libvips/conversion/im_copy_file.c index 402eda84..0115cd91 100644 --- a/libvips/conversion/im_copy_file.c +++ b/libvips/conversion/im_copy_file.c @@ -47,10 +47,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_copy_file: * @in: input image diff --git a/libvips/conversion/im_embed.c b/libvips/conversion/im_embed.c index 45a956f2..3243f6e9 100644 --- a/libvips/conversion/im_embed.c +++ b/libvips/conversion/im_embed.c @@ -60,10 +60,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Per-call struct. */ typedef struct _Embed { diff --git a/libvips/conversion/im_extract.c b/libvips/conversion/im_extract.c index d5f61605..2057041b 100644 --- a/libvips/conversion/im_extract.c +++ b/libvips/conversion/im_extract.c @@ -72,10 +72,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - typedef struct _Extract { IMAGE *in; IMAGE *out; diff --git a/libvips/conversion/im_falsecolour.c b/libvips/conversion/im_falsecolour.c index df72e566..4222d68c 100644 --- a/libvips/conversion/im_falsecolour.c +++ b/libvips/conversion/im_falsecolour.c @@ -50,10 +50,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Falsecolour scale nicked from a PET scan. */ static unsigned char PET_colour[][3] = { diff --git a/libvips/conversion/im_fliphor.c b/libvips/conversion/im_fliphor.c index a8be9bfb..5fa2e45b 100644 --- a/libvips/conversion/im_fliphor.c +++ b/libvips/conversion/im_fliphor.c @@ -52,10 +52,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Flip a small area. */ static int diff --git a/libvips/conversion/im_flipver.c b/libvips/conversion/im_flipver.c index cefe9e3a..7e462d3b 100644 --- a/libvips/conversion/im_flipver.c +++ b/libvips/conversion/im_flipver.c @@ -55,10 +55,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Flip a small area. */ static int diff --git a/libvips/conversion/im_gaussnoise.c b/libvips/conversion/im_gaussnoise.c index a94a2b36..392982ed 100644 --- a/libvips/conversion/im_gaussnoise.c +++ b/libvips/conversion/im_gaussnoise.c @@ -56,10 +56,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Keep parameters here. */ typedef struct { diff --git a/libvips/conversion/im_gbandjoin.c b/libvips/conversion/im_gbandjoin.c index 0de80b09..5badfa56 100644 --- a/libvips/conversion/im_gbandjoin.c +++ b/libvips/conversion/im_gbandjoin.c @@ -61,10 +61,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Struct we carry stuff around in. */ typedef struct joins { diff --git a/libvips/conversion/im_grid.c b/libvips/conversion/im_grid.c index 401c836c..5efc416d 100644 --- a/libvips/conversion/im_grid.c +++ b/libvips/conversion/im_grid.c @@ -45,10 +45,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - typedef struct _Grid { IMAGE *in; IMAGE *out; diff --git a/libvips/conversion/im_insert.c b/libvips/conversion/im_insert.c index 17462071..4ce01f9a 100644 --- a/libvips/conversion/im_insert.c +++ b/libvips/conversion/im_insert.c @@ -65,10 +65,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* The common part of most binary conversion * operators. We: * diff --git a/libvips/conversion/im_lrjoin.c b/libvips/conversion/im_lrjoin.c index 0af40723..0b2b4546 100644 --- a/libvips/conversion/im_lrjoin.c +++ b/libvips/conversion/im_lrjoin.c @@ -57,10 +57,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_lrjoin: diff --git a/libvips/conversion/im_mask2vips.c b/libvips/conversion/im_mask2vips.c index 31a10ecb..2558c53f 100644 --- a/libvips/conversion/im_mask2vips.c +++ b/libvips/conversion/im_mask2vips.c @@ -45,10 +45,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_mask2vips: * @in: input mask diff --git a/libvips/conversion/im_msb.c b/libvips/conversion/im_msb.c index 017d6f4e..a59e8d83 100644 --- a/libvips/conversion/im_msb.c +++ b/libvips/conversion/im_msb.c @@ -50,10 +50,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC */ - typedef struct _Msb { size_t index; size_t width; diff --git a/libvips/conversion/im_replicate.c b/libvips/conversion/im_replicate.c index 60ac948a..a247e2ee 100644 --- a/libvips/conversion/im_replicate.c +++ b/libvips/conversion/im_replicate.c @@ -51,10 +51,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static int replicate_gen( REGION *or, void *seq, void *a, void *b ) { diff --git a/libvips/conversion/im_ri2c.c b/libvips/conversion/im_ri2c.c index 9381128f..fea79543 100644 --- a/libvips/conversion/im_ri2c.c +++ b/libvips/conversion/im_ri2c.c @@ -52,10 +52,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define JOIN( TYPE ) { \ TYPE *p1 = (TYPE *) p[0]; \ TYPE *p2 = (TYPE *) p[1]; \ diff --git a/libvips/conversion/im_rot180.c b/libvips/conversion/im_rot180.c index ebd52218..c2bc64f9 100644 --- a/libvips/conversion/im_rot180.c +++ b/libvips/conversion/im_rot180.c @@ -62,10 +62,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static int rot180_gen( REGION *or, void *seq, void *a, void *b ) { diff --git a/libvips/conversion/im_rot270.c b/libvips/conversion/im_rot270.c index 2bc619db..3191861c 100644 --- a/libvips/conversion/im_rot270.c +++ b/libvips/conversion/im_rot270.c @@ -63,10 +63,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Rotate a small piece. */ static int diff --git a/libvips/conversion/im_rot90.c b/libvips/conversion/im_rot90.c index b9d94a7f..68bc6b54 100644 --- a/libvips/conversion/im_rot90.c +++ b/libvips/conversion/im_rot90.c @@ -63,10 +63,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Rotate a small piece. */ static int diff --git a/libvips/conversion/im_scale.c b/libvips/conversion/im_scale.c index 08fe7c18..39b8fade 100644 --- a/libvips/conversion/im_scale.c +++ b/libvips/conversion/im_scale.c @@ -53,10 +53,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_scale: * @in: input image diff --git a/libvips/conversion/im_scaleps.c b/libvips/conversion/im_scaleps.c index 81d2a047..83e77d74 100644 --- a/libvips/conversion/im_scaleps.c +++ b/libvips/conversion/im_scaleps.c @@ -55,10 +55,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_scaleps: * @in: input image diff --git a/libvips/conversion/im_subsample.c b/libvips/conversion/im_subsample.c index ad3ba268..42c94deb 100644 --- a/libvips/conversion/im_subsample.c +++ b/libvips/conversion/im_subsample.c @@ -47,10 +47,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Maximum width of input we ask for. */ #define IM_MAX_WIDTH (100) diff --git a/libvips/conversion/im_system.c b/libvips/conversion/im_system.c index a159c9e6..b4bb58b6 100644 --- a/libvips/conversion/im_system.c +++ b/libvips/conversion/im_system.c @@ -59,10 +59,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define IM_MAX_STRSIZE (4096) /** diff --git a/libvips/conversion/im_system_image.c b/libvips/conversion/im_system_image.c index 0c505e69..9e6013f1 100644 --- a/libvips/conversion/im_system_image.c +++ b/libvips/conversion/im_system_image.c @@ -49,10 +49,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define IM_MAX_STRSIZE (4096) static int diff --git a/libvips/conversion/im_tbjoin.c b/libvips/conversion/im_tbjoin.c index 2aecf096..30d708ca 100644 --- a/libvips/conversion/im_tbjoin.c +++ b/libvips/conversion/im_tbjoin.c @@ -57,10 +57,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_tbjoin: * @top: image to go on top diff --git a/libvips/conversion/im_text.c b/libvips/conversion/im_text.c index 4a21b599..a21a114e 100644 --- a/libvips/conversion/im_text.c +++ b/libvips/conversion/im_text.c @@ -53,10 +53,6 @@ #include #endif /*HAVE_PANGOFT2*/ -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #ifdef HAVE_PANGOFT2 static PangoLayout * diff --git a/libvips/conversion/im_vips2mask.c b/libvips/conversion/im_vips2mask.c index d5b75767..74f536a6 100644 --- a/libvips/conversion/im_vips2mask.c +++ b/libvips/conversion/im_vips2mask.c @@ -48,10 +48,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_vips2mask: * @in: input image diff --git a/libvips/conversion/im_wrap.c b/libvips/conversion/im_wrap.c index ee794baf..419850ae 100644 --- a/libvips/conversion/im_wrap.c +++ b/libvips/conversion/im_wrap.c @@ -42,10 +42,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_wrap: * @in: input image diff --git a/libvips/conversion/im_zoom.c b/libvips/conversion/im_zoom.c index 47d18543..649a37cb 100644 --- a/libvips/conversion/im_zoom.c +++ b/libvips/conversion/im_zoom.c @@ -77,10 +77,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Round N down to P boundary. */ #define ROUND_DOWN(N,P) ((N) - ((N) % P)) diff --git a/libvips/convolution/convol_dispatch.c b/libvips/convolution/convol_dispatch.c index 8501fc91..fa957e8a 100644 --- a/libvips/convolution/convol_dispatch.c +++ b/libvips/convolution/convol_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: convolution * @short_description: convolve and correlate images diff --git a/libvips/convolution/im_aconv.c b/libvips/convolution/im_aconv.c index 514b2b07..cdc579ea 100644 --- a/libvips/convolution/im_aconv.c +++ b/libvips/convolution/im_aconv.c @@ -91,10 +91,6 @@ $ vips im_max abs.v #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Maximum number of boxes we can break the mask into. */ #define MAX_LINES (10000) diff --git a/libvips/convolution/im_aconvsep.c b/libvips/convolution/im_aconvsep.c index bbc85359..aa39082d 100644 --- a/libvips/convolution/im_aconvsep.c +++ b/libvips/convolution/im_aconvsep.c @@ -77,10 +77,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Maximum number of lines we can break the mask into. */ #define MAX_LINES (1000) diff --git a/libvips/convolution/im_addgnoise.c b/libvips/convolution/im_addgnoise.c index 7ab0beed..6439a281 100644 --- a/libvips/convolution/im_addgnoise.c +++ b/libvips/convolution/im_addgnoise.c @@ -54,10 +54,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_addgnoise: * @in: input image diff --git a/libvips/convolution/im_compass.c b/libvips/convolution/im_compass.c index 309445ba..98474863 100644 --- a/libvips/convolution/im_compass.c +++ b/libvips/convolution/im_compass.c @@ -42,10 +42,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_compass: * @in: input image diff --git a/libvips/convolution/im_contrast_surface.c b/libvips/convolution/im_contrast_surface.c index 9731ed0f..d0102ca4 100644 --- a/libvips/convolution/im_contrast_surface.c +++ b/libvips/convolution/im_contrast_surface.c @@ -54,10 +54,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC */ - /** MACROS **/ /* from simple_macros.h */ diff --git a/libvips/convolution/im_conv.c b/libvips/convolution/im_conv.c index 4f4ad91c..e1671206 100644 --- a/libvips/convolution/im_conv.c +++ b/libvips/convolution/im_conv.c @@ -129,10 +129,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* We can't run more than this many passes. Larger than this and we * fall back to C. */ diff --git a/libvips/convolution/im_conv_f.c b/libvips/convolution/im_conv_f.c index 812051cf..3a29b3c2 100644 --- a/libvips/convolution/im_conv_f.c +++ b/libvips/convolution/im_conv_f.c @@ -80,10 +80,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Our parameters ... we take a copy of the mask argument, plus we make a * smaller version with the zeros squeezed out. */ diff --git a/libvips/convolution/im_fastcor.c b/libvips/convolution/im_fastcor.c index f05ad3af..ec28262a 100644 --- a/libvips/convolution/im_fastcor.c +++ b/libvips/convolution/im_fastcor.c @@ -60,10 +60,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Fastcor generate function. */ static int diff --git a/libvips/convolution/im_gradcor.c b/libvips/convolution/im_gradcor.c index 87731cd3..4ba8ab6f 100644 --- a/libvips/convolution/im_gradcor.c +++ b/libvips/convolution/im_gradcor.c @@ -47,10 +47,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** LOCAL TYPES **/ diff --git a/libvips/convolution/im_sharpen.c b/libvips/convolution/im_sharpen.c index 70aba1af..bdcf12c7 100644 --- a/libvips/convolution/im_sharpen.c +++ b/libvips/convolution/im_sharpen.c @@ -82,10 +82,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* A lut --- we need indexes in the range [-x3,x2], so add x3 to indexes * before starting to index table. */ diff --git a/libvips/convolution/im_spcor.c b/libvips/convolution/im_spcor.c index bb6010ee..97fa2125 100644 --- a/libvips/convolution/im_spcor.c +++ b/libvips/convolution/im_spcor.c @@ -74,10 +74,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Hold per-call state here. */ typedef struct { diff --git a/libvips/deprecated/cooc_funcs.c b/libvips/deprecated/cooc_funcs.c index 2826febb..84eb2ad8 100644 --- a/libvips/deprecated/cooc_funcs.c +++ b/libvips/deprecated/cooc_funcs.c @@ -75,10 +75,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static int im_cooc_sym(im, m, xpos, ypos, xsize, ysize, dx, dy) IMAGE *im, *m; diff --git a/libvips/deprecated/deprecated_dispatch.c b/libvips/deprecated/deprecated_dispatch.c index 7f30f8a0..a73f8ec4 100644 --- a/libvips/deprecated/deprecated_dispatch.c +++ b/libvips/deprecated/deprecated_dispatch.c @@ -37,10 +37,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* One image in, one out. */ static im_arg_desc one_in_one_out[] = { diff --git a/libvips/deprecated/dispatch_types.c b/libvips/deprecated/dispatch_types.c index 83e159ad..b487c3e9 100644 --- a/libvips/deprecated/dispatch_types.c +++ b/libvips/deprecated/dispatch_types.c @@ -47,10 +47,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Max str we parse. */ #define IM_MAX_STR (4096) diff --git a/libvips/deprecated/glds_funcs.c b/libvips/deprecated/glds_funcs.c index 5a419a47..5e9e7913 100644 --- a/libvips/deprecated/glds_funcs.c +++ b/libvips/deprecated/glds_funcs.c @@ -72,10 +72,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Keep the greylevel difference matrix as a 256x1 double image */ int diff --git a/libvips/deprecated/im_bernd.c b/libvips/deprecated/im_bernd.c index 5ac7f653..b0005456 100644 --- a/libvips/deprecated/im_bernd.c +++ b/libvips/deprecated/im_bernd.c @@ -52,10 +52,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static int extract( IMAGE *in, int x, int y, int w, int h ) { diff --git a/libvips/deprecated/im_clamp.c b/libvips/deprecated/im_clamp.c index 86df7570..66169f78 100644 --- a/libvips/deprecated/im_clamp.c +++ b/libvips/deprecated/im_clamp.c @@ -49,10 +49,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im_clamp( in, out,black, hstep, vstep ) IMAGE *in, *black, *out; diff --git a/libvips/deprecated/im_cmulnorm.c b/libvips/deprecated/im_cmulnorm.c index 7d4014d1..241ab324 100644 --- a/libvips/deprecated/im_cmulnorm.c +++ b/libvips/deprecated/im_cmulnorm.c @@ -50,10 +50,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_cmulnorm * @in1: input #IMAGE 1 diff --git a/libvips/deprecated/im_convsub.c b/libvips/deprecated/im_convsub.c index 43348193..e86d41da 100644 --- a/libvips/deprecated/im_convsub.c +++ b/libvips/deprecated/im_convsub.c @@ -56,10 +56,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Create multiplication luts for all non zero elements of the original mask; * which is kept in buffer of length buffersize * cnt is needed for freeing luts diff --git a/libvips/deprecated/im_debugim.c b/libvips/deprecated/im_debugim.c index c8d27547..65edcbd9 100644 --- a/libvips/deprecated/im_debugim.c +++ b/libvips/deprecated/im_debugim.c @@ -57,10 +57,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im_debugim( IMAGE *in ) { diff --git a/libvips/deprecated/im_dif_std.c b/libvips/deprecated/im_dif_std.c index 3c6a3a59..eba22859 100644 --- a/libvips/deprecated/im_dif_std.c +++ b/libvips/deprecated/im_dif_std.c @@ -46,10 +46,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static int im__mean_std_int_buffer( int *buffer, int size, double *pmean, double *pstd ) diff --git a/libvips/deprecated/im_fav4.c b/libvips/deprecated/im_fav4.c index 2a9878e2..9a3cf60a 100644 --- a/libvips/deprecated/im_fav4.c +++ b/libvips/deprecated/im_fav4.c @@ -38,10 +38,6 @@ Copyright (C) 1992, Kirk Martinez, History of Art Dept, Birkbeck College #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define ARGS "fav4: frame average 4 frames\nARGS: im1 im2 im3 im4 outfile" #define NFRAMES 4 diff --git a/libvips/deprecated/im_gadd.c b/libvips/deprecated/im_gadd.c index 92952ee6..33729844 100644 --- a/libvips/deprecated/im_gadd.c +++ b/libvips/deprecated/im_gadd.c @@ -57,10 +57,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - extern int im_gfadd(); extern int im_gaddim(); diff --git a/libvips/deprecated/im_gaddim.c b/libvips/deprecated/im_gaddim.c index fc2b9581..cd6cb4ae 100644 --- a/libvips/deprecated/im_gaddim.c +++ b/libvips/deprecated/im_gaddim.c @@ -58,10 +58,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* This function works on either mmaped files or on images in buffer */ diff --git a/libvips/deprecated/im_gfadd.c b/libvips/deprecated/im_gfadd.c index 61e72a2c..972f92b3 100644 --- a/libvips/deprecated/im_gfadd.c +++ b/libvips/deprecated/im_gfadd.c @@ -61,10 +61,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* uchar char ushort short uint int float double */ static int array[8][8] = { /* uchar */ { 0, 0, 0, 0, 0, 0, 0, 1 }, diff --git a/libvips/deprecated/im_line.c b/libvips/deprecated/im_line.c index b043176b..d6cb091a 100644 --- a/libvips/deprecated/im_line.c +++ b/libvips/deprecated/im_line.c @@ -52,10 +52,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im_line(image, x1, y1, x2, y2, pelval) IMAGE *image; int x1, x2, y1, y2, pelval; diff --git a/libvips/deprecated/im_litecor.c b/libvips/deprecated/im_litecor.c index 2eb29cfd..f8ef1e40 100644 --- a/libvips/deprecated/im_litecor.c +++ b/libvips/deprecated/im_litecor.c @@ -66,10 +66,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* If maximum output is > 255 scale output between minout and maxout, * by normalising maxout to 255. * If maximum output is < 255 do the light correction without scaling diff --git a/libvips/deprecated/im_print.c b/libvips/deprecated/im_print.c index 563bf0ed..e9cab48d 100644 --- a/libvips/deprecated/im_print.c +++ b/libvips/deprecated/im_print.c @@ -36,10 +36,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Print a string to stdout, with a "\n". Sometimes useful for debugging * language bindings. */ diff --git a/libvips/deprecated/im_printlines.c b/libvips/deprecated/im_printlines.c index aade7540..6e30ccec 100644 --- a/libvips/deprecated/im_printlines.c +++ b/libvips/deprecated/im_printlines.c @@ -54,10 +54,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Useful: Call a macro with the name, type pairs for all VIPS functions. */ #define im_for_all_types() \ diff --git a/libvips/deprecated/im_resize_linear.c b/libvips/deprecated/im_resize_linear.c index ab6f4247..fcda63a3 100644 --- a/libvips/deprecated/im_resize_linear.c +++ b/libvips/deprecated/im_resize_linear.c @@ -48,10 +48,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* What we do for each pel. */ #define LOOP( TYPE ) \ diff --git a/libvips/deprecated/im_setbox.c b/libvips/deprecated/im_setbox.c index 1ba8fde5..f0af2dab 100644 --- a/libvips/deprecated/im_setbox.c +++ b/libvips/deprecated/im_setbox.c @@ -48,10 +48,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - void im_setbox(pbox, xst, yst, xsiz, ysiz, ch_select) IMAGE_BOX *pbox; int xst, yst, xsiz, ysiz, ch_select; diff --git a/libvips/deprecated/im_simcontr.c b/libvips/deprecated/im_simcontr.c index bdf93fe8..02cccbd3 100644 --- a/libvips/deprecated/im_simcontr.c +++ b/libvips/deprecated/im_simcontr.c @@ -49,10 +49,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_simcontr: * @out: output image diff --git a/libvips/deprecated/im_slice.c b/libvips/deprecated/im_slice.c index 5c4b0aad..5e9e824c 100644 --- a/libvips/deprecated/im_slice.c +++ b/libvips/deprecated/im_slice.c @@ -55,10 +55,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define BRIGHT 255 #define GREY 128 #define DARK 0 diff --git a/libvips/deprecated/im_spatres.c b/libvips/deprecated/im_spatres.c index b768f256..be345b55 100644 --- a/libvips/deprecated/im_spatres.c +++ b/libvips/deprecated/im_spatres.c @@ -52,10 +52,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im_spatres( IMAGE *in, IMAGE *out, int step ) { diff --git a/libvips/deprecated/im_stretch3.c b/libvips/deprecated/im_stretch3.c index dcc1eaaa..5fe043b2 100644 --- a/libvips/deprecated/im_stretch3.c +++ b/libvips/deprecated/im_stretch3.c @@ -62,10 +62,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Data for the cubic interpolation function. */ typedef struct { diff --git a/libvips/deprecated/im_thresh.c b/libvips/deprecated/im_thresh.c index 197df51a..d4d65940 100644 --- a/libvips/deprecated/im_thresh.c +++ b/libvips/deprecated/im_thresh.c @@ -51,10 +51,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Useful: Call a macro with the name, type pairs for all VIPS functions. */ #define BRIGHT 255 #define DARK 0 diff --git a/libvips/deprecated/package.c b/libvips/deprecated/package.c index 62894f22..0c14efa5 100644 --- a/libvips/deprecated/package.c +++ b/libvips/deprecated/package.c @@ -56,10 +56,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Standard VIPS packages. */ extern im_package im__arithmetic; diff --git a/libvips/deprecated/rename.c b/libvips/deprecated/rename.c index bd2c2bb0..4c2f4560 100644 --- a/libvips/deprecated/rename.c +++ b/libvips/deprecated/rename.c @@ -39,10 +39,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im_remainderconst_vec( IMAGE *in, IMAGE *out, int n, double *c ) { diff --git a/libvips/deprecated/vips7compat.c b/libvips/deprecated/vips7compat.c index 102f3c6f..b285acd1 100644 --- a/libvips/deprecated/vips7compat.c +++ b/libvips/deprecated/vips7compat.c @@ -48,10 +48,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - VipsImage * im_open( const char *filename, const char *mode ) { diff --git a/libvips/deprecated/wrapvips7.c b/libvips/deprecated/wrapvips7.c index 3ba82752..be417820 100644 --- a/libvips/deprecated/wrapvips7.c +++ b/libvips/deprecated/wrapvips7.c @@ -61,10 +61,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define VIPS_WRAP7_PREFIX "VipsWrap7_" static GHashTable *vips_wrap7_subclass_types = NULL; diff --git a/libvips/format/fits.c b/libvips/format/fits.c index 639f006d..5101823a 100644 --- a/libvips/format/fits.c +++ b/libvips/format/fits.c @@ -83,10 +83,6 @@ im_fits2vips( const char *filename, VipsImage *out ) #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* TODO diff --git a/libvips/format/format.c b/libvips/format/format.c index c086c9bd..969a4031 100644 --- a/libvips/format/format.c +++ b/libvips/format/format.c @@ -37,10 +37,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: format * @short_description: load and save in a variety of formats diff --git a/libvips/format/format_dispatch.c b/libvips/format/format_dispatch.c index 40d2ec09..ebb39def 100644 --- a/libvips/format/format_dispatch.c +++ b/libvips/format/format_dispatch.c @@ -36,10 +36,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static int jpeg2vips_vec( im_object *argv ) { diff --git a/libvips/format/im_analyze2vips.c b/libvips/format/im_analyze2vips.c index 79994383..4fc4fcb1 100644 --- a/libvips/format/im_analyze2vips.c +++ b/libvips/format/im_analyze2vips.c @@ -58,10 +58,6 @@ #include "dbh.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* The things we can have in header fields. Can't use GType, since we want a * static value we can use in a declaration. */ diff --git a/libvips/format/im_csv2vips.c b/libvips/format/im_csv2vips.c index 01de0a6d..731a4a0d 100644 --- a/libvips/format/im_csv2vips.c +++ b/libvips/format/im_csv2vips.c @@ -55,10 +55,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Skip to the start of the next line (ie. read until we see a '\n'), return * zero if we are at EOF. * diff --git a/libvips/format/im_exr2vips.c b/libvips/format/im_exr2vips.c index 3a9d6cd2..4b5e8b9f 100644 --- a/libvips/format/im_exr2vips.c +++ b/libvips/format/im_exr2vips.c @@ -87,10 +87,6 @@ im_exr2vips( const char *name, IMAGE *out ) #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* What we track during a OpenEXR read. */ typedef struct { diff --git a/libvips/format/im_jpeg2vips.c b/libvips/format/im_jpeg2vips.c index e0e2541b..0f2c54c3 100644 --- a/libvips/format/im_jpeg2vips.c +++ b/libvips/format/im_jpeg2vips.c @@ -121,10 +121,6 @@ im_jpeg2vips( const char *name, IMAGE *out ) #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Define a new error handler for when we bomb out. */ typedef struct { diff --git a/libvips/format/im_magick2vips.c b/libvips/format/im_magick2vips.c index 8d386163..0948d524 100644 --- a/libvips/format/im_magick2vips.c +++ b/libvips/format/im_magick2vips.c @@ -99,10 +99,6 @@ im_magick2vips( const char *filename, IMAGE *im ) #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* pre-float Magick used to call this MaxRGB. */ #if !defined(QuantumRange) diff --git a/libvips/format/im_png2vips.c b/libvips/format/im_png2vips.c index 391609db..1cb5c36f 100644 --- a/libvips/format/im_png2vips.c +++ b/libvips/format/im_png2vips.c @@ -81,10 +81,6 @@ im_png2vips( const char *name, IMAGE *out ) #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #if PNG_LIBPNG_VER < 10003 #error "PNG library too old." #endif diff --git a/libvips/format/im_ppm2vips.c b/libvips/format/im_ppm2vips.c index aba1b102..7e607dc6 100644 --- a/libvips/format/im_ppm2vips.c +++ b/libvips/format/im_ppm2vips.c @@ -65,10 +65,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* The largest number/field/whatever we can read. */ #define IM_MAX_THING (80) diff --git a/libvips/format/im_raw2vips.c b/libvips/format/im_raw2vips.c index 12300278..a5e876cd 100644 --- a/libvips/format/im_raw2vips.c +++ b/libvips/format/im_raw2vips.c @@ -42,10 +42,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_raw2vips: * @filename: file to read diff --git a/libvips/format/im_tiff2vips.c b/libvips/format/im_tiff2vips.c index 4a2e3de9..40354204 100644 --- a/libvips/format/im_tiff2vips.c +++ b/libvips/format/im_tiff2vips.c @@ -183,10 +183,6 @@ im_tiff2vips( const char *tiffile, IMAGE *im ) #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Scanline-type process function. */ typedef void (*scanline_process_fn)( PEL *q, PEL *p, int n, void *client ); diff --git a/libvips/format/im_tile_cache.c b/libvips/format/im_tile_cache.c index 08e1a400..b1b54cb0 100644 --- a/libvips/format/im_tile_cache.c +++ b/libvips/format/im_tile_cache.c @@ -57,10 +57,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Lower and upper bounds for tile cache size. Choose an exact number based on * tile size. */ diff --git a/libvips/format/im_vips2csv.c b/libvips/format/im_vips2csv.c index a0631ee4..0b0db0a1 100644 --- a/libvips/format/im_vips2csv.c +++ b/libvips/format/im_vips2csv.c @@ -44,10 +44,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define PRINT_INT( TYPE ) fprintf( fp, "%d", *((TYPE*)p) ); #define PRINT_FLOAT( TYPE ) fprintf( fp, "%g", *((TYPE*)p) ); #define PRINT_COMPLEX( TYPE ) fprintf( fp, "(%g, %g)", \ diff --git a/libvips/format/im_vips2jpeg.c b/libvips/format/im_vips2jpeg.c index 7769b1f9..190c2853 100644 --- a/libvips/format/im_vips2jpeg.c +++ b/libvips/format/im_vips2jpeg.c @@ -144,10 +144,6 @@ im_vips2mimejpeg( IMAGE *in, int qfac ) #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Define a new error handler for when we bomb out. */ typedef struct { diff --git a/libvips/format/im_vips2png.c b/libvips/format/im_vips2png.c index 9f39c1ff..a8c05892 100644 --- a/libvips/format/im_vips2png.c +++ b/libvips/format/im_vips2png.c @@ -85,10 +85,6 @@ im_vips2png( IMAGE *in, const char *filename ) #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #if PNG_LIBPNG_VER < 10003 #error "PNG library too old." #endif diff --git a/libvips/format/im_vips2ppm.c b/libvips/format/im_vips2ppm.c index c89e53a9..83997935 100644 --- a/libvips/format/im_vips2ppm.c +++ b/libvips/format/im_vips2ppm.c @@ -53,10 +53,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - typedef int (*write_fn)( IMAGE *in, FILE *fp, PEL *p ); /* What we track during a PPM write. diff --git a/libvips/format/im_vips2raw.c b/libvips/format/im_vips2raw.c index d4f6fc85..3266954d 100644 --- a/libvips/format/im_vips2raw.c +++ b/libvips/format/im_vips2raw.c @@ -47,10 +47,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* What we track during a write diff --git a/libvips/format/im_vips2tiff.c b/libvips/format/im_vips2tiff.c index 3fa6965a..52568945 100644 --- a/libvips/format/im_vips2tiff.c +++ b/libvips/format/im_vips2tiff.c @@ -186,10 +186,6 @@ im_vips2tiff( IMAGE *im, const char *filename ) #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Max no of tiles we buffer in a layer. Enough to buffer a line of 64x64 * tiles on a 100k pixel across image. */ diff --git a/libvips/format/matlab.c b/libvips/format/matlab.c index 0830e9dd..064fb5a1 100644 --- a/libvips/format/matlab.c +++ b/libvips/format/matlab.c @@ -65,10 +65,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* What we track during a Mat-file read. */ typedef struct { diff --git a/libvips/format/radiance.c b/libvips/format/radiance.c index 4ea230e0..12328495 100644 --- a/libvips/format/radiance.c +++ b/libvips/format/radiance.c @@ -125,10 +125,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Begin copy-paste from Radiance sources. */ diff --git a/libvips/freq_filt/fft_sp.c b/libvips/freq_filt/fft_sp.c index 5b0fafd9..d5afa078 100644 --- a/libvips/freq_filt/fft_sp.c +++ b/libvips/freq_filt/fft_sp.c @@ -78,10 +78,6 @@ insure its reliability. */ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static float *Const = NULL, *iConst = NULL; static int storesize = 0, Constsize = 0; diff --git a/libvips/freq_filt/fmask4th.c b/libvips/freq_filt/fmask4th.c index 29100187..080988de 100644 --- a/libvips/freq_filt/fmask4th.c +++ b/libvips/freq_filt/fmask4th.c @@ -75,10 +75,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /************************************************************************/ /* malloc space and create normalised coefficients accross */ /* the x (horizontal) and y (vertical) direction. */ diff --git a/libvips/freq_filt/fmaskcir.c b/libvips/freq_filt/fmaskcir.c index a87cc402..d2341ab6 100644 --- a/libvips/freq_filt/fmaskcir.c +++ b/libvips/freq_filt/fmaskcir.c @@ -66,10 +66,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /************************************************************************ * malloc space and create normalised coefficients accross diff --git a/libvips/freq_filt/freq_dispatch.c b/libvips/freq_filt/freq_dispatch.c index 96960111..12393a9f 100644 --- a/libvips/freq_filt/freq_dispatch.c +++ b/libvips/freq_filt/freq_dispatch.c @@ -41,10 +41,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: freq_filt * @short_description: fourier transforms and frequency-domin filters diff --git a/libvips/freq_filt/im_disp_ps.c b/libvips/freq_filt/im_disp_ps.c index 3bf5a4bc..7ee54ba1 100644 --- a/libvips/freq_filt/im_disp_ps.c +++ b/libvips/freq_filt/im_disp_ps.c @@ -54,10 +54,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static int disp_ps( IMAGE *dummy, IMAGE *in, IMAGE *out ) { diff --git a/libvips/freq_filt/im_fractsurf.c b/libvips/freq_filt/im_fractsurf.c index 7c54fb09..a1d9e62b 100644 --- a/libvips/freq_filt/im_fractsurf.c +++ b/libvips/freq_filt/im_fractsurf.c @@ -49,10 +49,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_fractsurf: * @out: output image diff --git a/libvips/freq_filt/im_freq_mask.c b/libvips/freq_filt/im_freq_mask.c index b93df9e4..29cd3dc6 100644 --- a/libvips/freq_filt/im_freq_mask.c +++ b/libvips/freq_filt/im_freq_mask.c @@ -47,10 +47,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Create the final mask by copying the 1/4 of the mask held by coeff * The final mask is written onto image on a line by line basis * The buffer coeff should hold (xsize/2+1)*(ysize/2+1) elms diff --git a/libvips/freq_filt/im_freqflt.c b/libvips/freq_filt/im_freqflt.c index 53c9b83e..4fcbd51b 100644 --- a/libvips/freq_filt/im_freqflt.c +++ b/libvips/freq_filt/im_freqflt.c @@ -67,10 +67,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_freqflt: * @in: input image diff --git a/libvips/freq_filt/im_fwfft.c b/libvips/freq_filt/im_fwfft.c index 13220deb..f9bbaa32 100644 --- a/libvips/freq_filt/im_fwfft.c +++ b/libvips/freq_filt/im_fwfft.c @@ -79,10 +79,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #ifdef HAVE_FFTW /* Call rfftw for a 1 band real image. */ diff --git a/libvips/freq_filt/im_invfft.c b/libvips/freq_filt/im_invfft.c index 444495d7..c9064a84 100644 --- a/libvips/freq_filt/im_invfft.c +++ b/libvips/freq_filt/im_invfft.c @@ -68,10 +68,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #ifdef HAVE_FFTW /* Call fftw for a 1 band image. */ diff --git a/libvips/freq_filt/im_invfftr.c b/libvips/freq_filt/im_invfftr.c index 9ef8c33a..73e1092e 100644 --- a/libvips/freq_filt/im_invfftr.c +++ b/libvips/freq_filt/im_invfftr.c @@ -56,10 +56,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #ifdef HAVE_FFTW /* Use fftw2. */ diff --git a/libvips/freq_filt/im_phasecor_fft.c b/libvips/freq_filt/im_phasecor_fft.c index 97c9d70f..5f456be6 100644 --- a/libvips/freq_filt/im_phasecor_fft.c +++ b/libvips/freq_filt/im_phasecor_fft.c @@ -42,10 +42,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_phasecor_fft: * @in1: first input image diff --git a/libvips/freq_filt/im_rotquad.c b/libvips/freq_filt/im_rotquad.c index ddee52f8..a37ec2b5 100644 --- a/libvips/freq_filt/im_rotquad.c +++ b/libvips/freq_filt/im_rotquad.c @@ -59,10 +59,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_rotquad: * @in: input image diff --git a/libvips/histograms_lut/hist_dispatch.c b/libvips/histograms_lut/hist_dispatch.c index c76d13bf..4172a09a 100644 --- a/libvips/histograms_lut/hist_dispatch.c +++ b/libvips/histograms_lut/hist_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: histograms_lut * @short_description: find, manipulate and apply histograms and lookup tables diff --git a/libvips/histograms_lut/im_buildlut.c b/libvips/histograms_lut/im_buildlut.c index 69febd16..d338a9f3 100644 --- a/libvips/histograms_lut/im_buildlut.c +++ b/libvips/histograms_lut/im_buildlut.c @@ -55,10 +55,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Our state. */ typedef struct _State { diff --git a/libvips/histograms_lut/im_gammacorrect.c b/libvips/histograms_lut/im_gammacorrect.c index 5d011431..539fb3b8 100644 --- a/libvips/histograms_lut/im_gammacorrect.c +++ b/libvips/histograms_lut/im_gammacorrect.c @@ -46,10 +46,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_gammacorrect: * @in: input image diff --git a/libvips/histograms_lut/im_heq.c b/libvips/histograms_lut/im_heq.c index d69c52ef..cb053f99 100644 --- a/libvips/histograms_lut/im_heq.c +++ b/libvips/histograms_lut/im_heq.c @@ -50,10 +50,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_heq: * @in: input image diff --git a/libvips/histograms_lut/im_hist.c b/libvips/histograms_lut/im_hist.c index f8446ca9..db200109 100644 --- a/libvips/histograms_lut/im_hist.c +++ b/libvips/histograms_lut/im_hist.c @@ -46,10 +46,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_hist: * @in: input image diff --git a/libvips/histograms_lut/im_histeq.c b/libvips/histograms_lut/im_histeq.c index deff9828..0447c03d 100644 --- a/libvips/histograms_lut/im_histeq.c +++ b/libvips/histograms_lut/im_histeq.c @@ -57,10 +57,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define ACCUMULATE( ITYPE, OTYPE ) { \ for( b = 0; b < nb; b++ ) { \ ITYPE *p = (ITYPE *) in->data; \ diff --git a/libvips/histograms_lut/im_histgr.c b/libvips/histograms_lut/im_histgr.c index faf2c0bf..47b8aa3c 100644 --- a/libvips/histograms_lut/im_histgr.c +++ b/libvips/histograms_lut/im_histgr.c @@ -59,10 +59,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Accumulate a histogram in one of these. */ typedef struct { diff --git a/libvips/histograms_lut/im_histindexed.c b/libvips/histograms_lut/im_histindexed.c index c46d3375..54566542 100644 --- a/libvips/histograms_lut/im_histindexed.c +++ b/libvips/histograms_lut/im_histindexed.c @@ -43,10 +43,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Accumulate a histogram in one of these. */ typedef struct { diff --git a/libvips/histograms_lut/im_histnD.c b/libvips/histograms_lut/im_histnD.c index d8e24131..4f228364 100644 --- a/libvips/histograms_lut/im_histnD.c +++ b/libvips/histograms_lut/im_histnD.c @@ -45,10 +45,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Accumulate a histogram in one of these. */ typedef struct { diff --git a/libvips/histograms_lut/im_histplot.c b/libvips/histograms_lut/im_histplot.c index df79bba9..25b2f202 100644 --- a/libvips/histograms_lut/im_histplot.c +++ b/libvips/histograms_lut/im_histplot.c @@ -65,10 +65,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Normalise an image using the rules noted above. */ static int diff --git a/libvips/histograms_lut/im_histspec.c b/libvips/histograms_lut/im_histspec.c index 5ba9cfb9..293353c9 100644 --- a/libvips/histograms_lut/im_histspec.c +++ b/libvips/histograms_lut/im_histspec.c @@ -51,10 +51,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* #define DEBUG */ diff --git a/libvips/histograms_lut/im_hsp.c b/libvips/histograms_lut/im_hsp.c index 0db4fbd0..bedba8a6 100644 --- a/libvips/histograms_lut/im_hsp.c +++ b/libvips/histograms_lut/im_hsp.c @@ -48,10 +48,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_hsp: * @in: input image diff --git a/libvips/histograms_lut/im_identity.c b/libvips/histograms_lut/im_identity.c index ee1402d6..425fb592 100644 --- a/libvips/histograms_lut/im_identity.c +++ b/libvips/histograms_lut/im_identity.c @@ -51,10 +51,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_identity: * @lut: output image diff --git a/libvips/histograms_lut/im_invertlut.c b/libvips/histograms_lut/im_invertlut.c index 33c80f05..bb735377 100644 --- a/libvips/histograms_lut/im_invertlut.c +++ b/libvips/histograms_lut/im_invertlut.c @@ -46,10 +46,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* #define DEBUG */ diff --git a/libvips/histograms_lut/im_lhisteq.c b/libvips/histograms_lut/im_lhisteq.c index da9e2192..ceb347ee 100644 --- a/libvips/histograms_lut/im_lhisteq.c +++ b/libvips/histograms_lut/im_lhisteq.c @@ -56,10 +56,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Hold global stuff here. */ typedef struct { diff --git a/libvips/histograms_lut/im_maplut.c b/libvips/histograms_lut/im_maplut.c index f0e43a9e..2d2be9f9 100644 --- a/libvips/histograms_lut/im_maplut.c +++ b/libvips/histograms_lut/im_maplut.c @@ -68,10 +68,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Struct we carry for LUT operations. */ typedef struct { diff --git a/libvips/histograms_lut/im_mpercent.c b/libvips/histograms_lut/im_mpercent.c index 4f133d8d..a6985c12 100644 --- a/libvips/histograms_lut/im_mpercent.c +++ b/libvips/histograms_lut/im_mpercent.c @@ -49,10 +49,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_mpercent_hist: * @hist: input histogram image diff --git a/libvips/histograms_lut/im_project.c b/libvips/histograms_lut/im_project.c index daad9ac3..e4840d50 100644 --- a/libvips/histograms_lut/im_project.c +++ b/libvips/histograms_lut/im_project.c @@ -44,10 +44,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Accumulate a projection in one of these. */ typedef struct { diff --git a/libvips/histograms_lut/im_stdif.c b/libvips/histograms_lut/im_stdif.c index f09d004b..0b11758b 100644 --- a/libvips/histograms_lut/im_stdif.c +++ b/libvips/histograms_lut/im_stdif.c @@ -60,10 +60,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Hold global stuff here. */ typedef struct { diff --git a/libvips/histograms_lut/tone.c b/libvips/histograms_lut/tone.c index 68d3fb3f..2ef0f406 100644 --- a/libvips/histograms_lut/tone.c +++ b/libvips/histograms_lut/tone.c @@ -52,10 +52,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Parameters for tone curve formation. */ typedef struct { diff --git a/libvips/inplace/draw.c b/libvips/inplace/draw.c index fa49e09f..682bc607 100644 --- a/libvips/inplace/draw.c +++ b/libvips/inplace/draw.c @@ -43,10 +43,6 @@ #include "draw.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Fill a scanline between points x1 and x2 inclusive. x1 < x2. */ void diff --git a/libvips/inplace/flood.c b/libvips/inplace/flood.c index b00ecd74..3f9a4078 100644 --- a/libvips/inplace/flood.c +++ b/libvips/inplace/flood.c @@ -69,10 +69,6 @@ #include "draw.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Size of a scanline buffer. We allocate a list of these to hold scanlines * we need to visit. */ diff --git a/libvips/inplace/im_draw_circle.c b/libvips/inplace/im_draw_circle.c index 76b35444..336cbc56 100644 --- a/libvips/inplace/im_draw_circle.c +++ b/libvips/inplace/im_draw_circle.c @@ -56,10 +56,6 @@ #include "draw.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Our state. */ typedef struct { diff --git a/libvips/inplace/im_draw_image.c b/libvips/inplace/im_draw_image.c index 9f09c9cc..98ce5e97 100644 --- a/libvips/inplace/im_draw_image.c +++ b/libvips/inplace/im_draw_image.c @@ -64,10 +64,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* The common part of most binary inplace operators. * * Unlike im__formatalike() and friends, we can only change one of the images, diff --git a/libvips/inplace/im_draw_line.c b/libvips/inplace/im_draw_line.c index 8572ffa3..7df347a6 100644 --- a/libvips/inplace/im_draw_line.c +++ b/libvips/inplace/im_draw_line.c @@ -60,10 +60,6 @@ #include "draw.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - typedef struct _Line { Draw draw; diff --git a/libvips/inplace/im_draw_mask.c b/libvips/inplace/im_draw_mask.c index 7d5f784d..b6ca33d2 100644 --- a/libvips/inplace/im_draw_mask.c +++ b/libvips/inplace/im_draw_mask.c @@ -58,10 +58,6 @@ #include "draw.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - typedef struct _Mask { Draw draw; diff --git a/libvips/inplace/im_draw_point.c b/libvips/inplace/im_draw_point.c index 66b86e0c..905cdf95 100644 --- a/libvips/inplace/im_draw_point.c +++ b/libvips/inplace/im_draw_point.c @@ -56,10 +56,6 @@ #include "draw.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - typedef struct _Point { Draw draw; } Point; diff --git a/libvips/inplace/im_draw_rect.c b/libvips/inplace/im_draw_rect.c index 63d5f532..70d9a428 100644 --- a/libvips/inplace/im_draw_rect.c +++ b/libvips/inplace/im_draw_rect.c @@ -58,10 +58,6 @@ #include "draw.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_draw_rect: * @image: image to draw on diff --git a/libvips/inplace/im_draw_smudge.c b/libvips/inplace/im_draw_smudge.c index a9d34bad..c0cfea0d 100644 --- a/libvips/inplace/im_draw_smudge.c +++ b/libvips/inplace/im_draw_smudge.c @@ -54,10 +54,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* The mask we use for blurring. */ static INTMASK *blur = NULL; diff --git a/libvips/inplace/inplace_dispatch.c b/libvips/inplace/inplace_dispatch.c index 2ad68e62..dbe1338e 100644 --- a/libvips/inplace/inplace_dispatch.c +++ b/libvips/inplace/inplace_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: inplace * @short_description: in-place paintbox operations: flood, paste, line, diff --git a/libvips/iofuncs/base64.c b/libvips/iofuncs/base64.c index c7b6d87f..60a7733d 100644 --- a/libvips/iofuncs/base64.c +++ b/libvips/iofuncs/base64.c @@ -85,10 +85,6 @@ Modified on: #include "base64.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static unsigned char b64_list[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; diff --git a/libvips/iofuncs/buf.c b/libvips/iofuncs/buf.c index a09d45f1..1048a250 100644 --- a/libvips/iofuncs/buf.c +++ b/libvips/iofuncs/buf.c @@ -44,10 +44,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: buf * @short_description: a string you can append to diff --git a/libvips/iofuncs/buffer.c b/libvips/iofuncs/buffer.c index deaa860a..1399bc51 100644 --- a/libvips/iofuncs/buffer.c +++ b/libvips/iofuncs/buffer.c @@ -62,10 +62,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #ifdef DEBUG /* Track all regions here for debugging. */ diff --git a/libvips/iofuncs/cache.c b/libvips/iofuncs/cache.c index 261c92fa..bef81ab9 100644 --- a/libvips/iofuncs/cache.c +++ b/libvips/iofuncs/cache.c @@ -66,10 +66,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Set by GOption from the command line, eg. "12m". */ char *vips__cache_max = NULL; diff --git a/libvips/iofuncs/error.c b/libvips/iofuncs/error.c index e9866eaf..89bc2111 100644 --- a/libvips/iofuncs/error.c +++ b/libvips/iofuncs/error.c @@ -67,10 +67,6 @@ #include #endif /*OS_WIN32*/ -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: error * @short_description: error messages and error handling diff --git a/libvips/iofuncs/generate.c b/libvips/iofuncs/generate.c index 7d00b3ac..edc02212 100644 --- a/libvips/iofuncs/generate.c +++ b/libvips/iofuncs/generate.c @@ -103,10 +103,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: generate * @short_description: calculate pixels and pixel buffers diff --git a/libvips/iofuncs/header.c b/libvips/iofuncs/header.c index f1e96ec9..47c4b0cb 100644 --- a/libvips/iofuncs/header.c +++ b/libvips/iofuncs/header.c @@ -65,10 +65,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: header * @short_description: get, set and walk image headers diff --git a/libvips/iofuncs/image.c b/libvips/iofuncs/image.c index ac8a1071..f53765ff 100644 --- a/libvips/iofuncs/image.c +++ b/libvips/iofuncs/image.c @@ -51,10 +51,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: image * @short_description: the VIPS image class diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c index e7de0b84..8b78dd2a 100644 --- a/libvips/iofuncs/init.c +++ b/libvips/iofuncs/init.c @@ -80,10 +80,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Use in various small places where we need a mutex and it's not worth * making a private one. */ diff --git a/libvips/iofuncs/mapfile.c b/libvips/iofuncs/mapfile.c index da42c100..17588926 100644 --- a/libvips/iofuncs/mapfile.c +++ b/libvips/iofuncs/mapfile.c @@ -88,10 +88,6 @@ #include #endif /*OS_WIN32*/ -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - void * vips__mmap( int fd, int writeable, size_t length, gint64 offset ) { diff --git a/libvips/iofuncs/memory.c b/libvips/iofuncs/memory.c index 95a1aeb4..e358ce91 100644 --- a/libvips/iofuncs/memory.c +++ b/libvips/iofuncs/memory.c @@ -63,10 +63,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: memory * @short_description: memory utilities diff --git a/libvips/iofuncs/object.c b/libvips/iofuncs/object.c index d477f15a..ec8ebe30 100644 --- a/libvips/iofuncs/object.c +++ b/libvips/iofuncs/object.c @@ -47,10 +47,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Properties. */ enum { diff --git a/libvips/iofuncs/operation.c b/libvips/iofuncs/operation.c index 3def51e9..9d92c780 100644 --- a/libvips/iofuncs/operation.c +++ b/libvips/iofuncs/operation.c @@ -46,10 +46,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Abstract base class for operations. */ diff --git a/libvips/iofuncs/pool.c b/libvips/iofuncs/pool.c index 1f422703..e195c6cd 100644 --- a/libvips/iofuncs/pool.c +++ b/libvips/iofuncs/pool.c @@ -43,10 +43,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Here's how to handle ref counts when calling vips operations: diff --git a/libvips/iofuncs/rect.c b/libvips/iofuncs/rect.c index 41acbf8d..0e4a1c62 100644 --- a/libvips/iofuncs/rect.c +++ b/libvips/iofuncs/rect.c @@ -43,10 +43,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: rect * @short_description: the VIPS rectangle class diff --git a/libvips/iofuncs/region.c b/libvips/iofuncs/region.c index 2584b971..35cd0d10 100644 --- a/libvips/iofuncs/region.c +++ b/libvips/iofuncs/region.c @@ -93,10 +93,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: region * @short_description: small, rectangular parts of images diff --git a/libvips/iofuncs/semaphore.c b/libvips/iofuncs/semaphore.c index f5122dd1..6b094d02 100644 --- a/libvips/iofuncs/semaphore.c +++ b/libvips/iofuncs/semaphore.c @@ -53,10 +53,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - void vips_semaphore_init( VipsSemaphore *s, int v, char *name ) { diff --git a/libvips/iofuncs/sink.c b/libvips/iofuncs/sink.c index 979a60e6..1be75273 100644 --- a/libvips/iofuncs/sink.c +++ b/libvips/iofuncs/sink.c @@ -49,10 +49,6 @@ #include "sink.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Per-call state. */ typedef struct _Sink { diff --git a/libvips/iofuncs/sinkdisc.c b/libvips/iofuncs/sinkdisc.c index 4ce95530..6afc93e2 100644 --- a/libvips/iofuncs/sinkdisc.c +++ b/libvips/iofuncs/sinkdisc.c @@ -63,10 +63,6 @@ #include "sink.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* A buffer we are going to write to disc in a background thread. */ typedef struct _WriteBuffer { diff --git a/libvips/iofuncs/sinkmemory.c b/libvips/iofuncs/sinkmemory.c index 025c3b21..79d5fc82 100644 --- a/libvips/iofuncs/sinkmemory.c +++ b/libvips/iofuncs/sinkmemory.c @@ -49,10 +49,6 @@ #include "sink.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Per-call state. */ typedef struct _Sink { diff --git a/libvips/iofuncs/sinkscreen.c b/libvips/iofuncs/sinkscreen.c index d46e2df2..bea4602b 100644 --- a/libvips/iofuncs/sinkscreen.c +++ b/libvips/iofuncs/sinkscreen.c @@ -66,10 +66,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* A have-threads we can test in if(). */ #ifdef HAVE_THREADS diff --git a/libvips/iofuncs/threadpool.c b/libvips/iofuncs/threadpool.c index 41a81e77..aec3e536 100644 --- a/libvips/iofuncs/threadpool.c +++ b/libvips/iofuncs/threadpool.c @@ -68,10 +68,6 @@ #include #endif /*OS_WIN32*/ -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: threadpool * @short_description: pools of worker threads diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c index bd79b14d..dba30f50 100644 --- a/libvips/iofuncs/util.c +++ b/libvips/iofuncs/util.c @@ -57,10 +57,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Try to make an O_BINARY ... sometimes need the leading '_'. */ #ifdef BINARY_OPEN diff --git a/libvips/iofuncs/vector.c b/libvips/iofuncs/vector.c index a179a0c9..fe8b8c15 100644 --- a/libvips/iofuncs/vector.c +++ b/libvips/iofuncs/vector.c @@ -56,10 +56,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Cleared by the command-line --vips-novector switch and the IM_NOVECTOR env * var. */ diff --git a/libvips/iofuncs/vips.c b/libvips/iofuncs/vips.c index cfd3901b..a8854e5b 100644 --- a/libvips/iofuncs/vips.c +++ b/libvips/iofuncs/vips.c @@ -86,10 +86,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Try to make an O_BINARY ... sometimes need the leading '_'. */ #ifdef BINARY_OPEN diff --git a/libvips/iofuncs/window.c b/libvips/iofuncs/window.c index fbfa5af3..25ccb47a 100644 --- a/libvips/iofuncs/window.c +++ b/libvips/iofuncs/window.c @@ -62,10 +62,6 @@ #include #endif /*OS_WIN32*/ -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Sanity checking ... write to this during read tests to make sure we don't * get optimised out. */ diff --git a/libvips/mask/im_gaussmasks.c b/libvips/mask/im_gaussmasks.c index 36ad02fd..c1c9d610 100644 --- a/libvips/mask/im_gaussmasks.c +++ b/libvips/mask/im_gaussmasks.c @@ -51,10 +51,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define IM_MAXMASK 5000 /** diff --git a/libvips/mask/im_logmasks.c b/libvips/mask/im_logmasks.c index 6dbfc70a..829a43d4 100644 --- a/libvips/mask/im_logmasks.c +++ b/libvips/mask/im_logmasks.c @@ -55,10 +55,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define IM_MAXMASK 256 /** diff --git a/libvips/mask/im_matcat.c b/libvips/mask/im_matcat.c index b92ff398..955b9a17 100644 --- a/libvips/mask/im_matcat.c +++ b/libvips/mask/im_matcat.c @@ -42,10 +42,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_matcat: * @top: input matrix diff --git a/libvips/mask/im_matinv.c b/libvips/mask/im_matinv.c index db87cd60..03663466 100644 --- a/libvips/mask/im_matinv.c +++ b/libvips/mask/im_matinv.c @@ -54,10 +54,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** CONSTANTS **/ diff --git a/libvips/mask/im_matmul.c b/libvips/mask/im_matmul.c index 607409c4..f8fc18f6 100644 --- a/libvips/mask/im_matmul.c +++ b/libvips/mask/im_matmul.c @@ -41,10 +41,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_matmul: * @in1: input matrix diff --git a/libvips/mask/im_mattrn.c b/libvips/mask/im_mattrn.c index ba6fb4be..b8c0608b 100644 --- a/libvips/mask/im_mattrn.c +++ b/libvips/mask/im_mattrn.c @@ -39,10 +39,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_mattrn: * @in: input matrix diff --git a/libvips/mask/mask_dispatch.c b/libvips/mask/mask_dispatch.c index d7c4e298..f164e14e 100644 --- a/libvips/mask/mask_dispatch.c +++ b/libvips/mask/mask_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* One matrix in, one out. */ static im_arg_desc one_in_one_out[] = { diff --git a/libvips/mask/matalloc.c b/libvips/mask/matalloc.c index e1e11219..374854af 100644 --- a/libvips/mask/matalloc.c +++ b/libvips/mask/matalloc.c @@ -14,10 +14,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define TINY 1.0e-200 /* @(#) Allocates and returns an pointer at the beginning of diff --git a/libvips/mask/rotmask.c b/libvips/mask/rotmask.c index 19cc2ba6..d3701abb 100644 --- a/libvips/mask/rotmask.c +++ b/libvips/mask/rotmask.c @@ -55,10 +55,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Creates the offsets to rotate by 45 degrees an odd size square mask */ int * diff --git a/libvips/mask/rw_mask.c b/libvips/mask/rw_mask.c index d2dc7163..c8c26b93 100644 --- a/libvips/mask/rw_mask.c +++ b/libvips/mask/rw_mask.c @@ -95,10 +95,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: mask * @short_description: load, save and process mask (matrix) objects diff --git a/libvips/morphology/im_cntlines.c b/libvips/morphology/im_cntlines.c index 0a96a5c4..fddf711e 100644 --- a/libvips/morphology/im_cntlines.c +++ b/libvips/morphology/im_cntlines.c @@ -47,10 +47,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_cntlines: * @im: input #IMAGE diff --git a/libvips/morphology/im_label_regions.c b/libvips/morphology/im_label_regions.c index 5db7d7f8..1b59a599 100644 --- a/libvips/morphology/im_label_regions.c +++ b/libvips/morphology/im_label_regions.c @@ -39,10 +39,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_label_regions: * @test: image to test diff --git a/libvips/morphology/im_profile.c b/libvips/morphology/im_profile.c index 0bda951f..adfd8d08 100644 --- a/libvips/morphology/im_profile.c +++ b/libvips/morphology/im_profile.c @@ -50,10 +50,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_profile: * @in: input image diff --git a/libvips/morphology/im_rank.c b/libvips/morphology/im_rank.c index 8e64d23f..66a0778b 100644 --- a/libvips/morphology/im_rank.c +++ b/libvips/morphology/im_rank.c @@ -61,10 +61,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Global state: save our parameters here. */ typedef struct { diff --git a/libvips/morphology/im_rank_image.c b/libvips/morphology/im_rank_image.c index 416cdd4e..0101e15e 100644 --- a/libvips/morphology/im_rank_image.c +++ b/libvips/morphology/im_rank_image.c @@ -46,10 +46,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Parameters. */ typedef struct Rank { diff --git a/libvips/morphology/im_zerox.c b/libvips/morphology/im_zerox.c index ff7ffa43..496bfa22 100644 --- a/libvips/morphology/im_zerox.c +++ b/libvips/morphology/im_zerox.c @@ -51,10 +51,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define LOOP( TYPE ) { \ for( i = 0; i < ne; i++ ) { \ TYPE p1 = ((TYPE *)p)[i]; \ diff --git a/libvips/morphology/morph_dispatch.c b/libvips/morphology/morph_dispatch.c index dc010e0d..4ce7bbb2 100644 --- a/libvips/morphology/morph_dispatch.c +++ b/libvips/morphology/morph_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: morphology * @short_description: morphological operators, rank filters and related image diff --git a/libvips/morphology/morphology.c b/libvips/morphology/morphology.c index fe4480c3..4bbcef51 100644 --- a/libvips/morphology/morphology.c +++ b/libvips/morphology/morphology.c @@ -63,10 +63,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* The two operators we implement. They are more hit-miss, really. */ typedef enum { diff --git a/libvips/mosaicing/global_balance.c b/libvips/mosaicing/global_balance.c index f1ad17b0..cb6542aa 100644 --- a/libvips/mosaicing/global_balance.c +++ b/libvips/mosaicing/global_balance.c @@ -110,10 +110,6 @@ #include "merge.h" #include "global_balance.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define MAX_ITEMS (50) /* How pix an overlap has to be (in pixels) before we think it's trivial and diff --git a/libvips/mosaicing/im_align_bands.c b/libvips/mosaicing/im_align_bands.c index 63694c07..d2746585 100644 --- a/libvips/mosaicing/im_align_bands.c +++ b/libvips/mosaicing/im_align_bands.c @@ -39,10 +39,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_align_bands: * @in: image to align diff --git a/libvips/mosaicing/im_avgdxdy.c b/libvips/mosaicing/im_avgdxdy.c index 838f5c31..70958d47 100644 --- a/libvips/mosaicing/im_avgdxdy.c +++ b/libvips/mosaicing/im_avgdxdy.c @@ -54,10 +54,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im__avgdxdy( TIE_POINTS *points, int *dx, int *dy ) { diff --git a/libvips/mosaicing/im_chkpair.c b/libvips/mosaicing/im_chkpair.c index 14070d41..84cc6ab9 100644 --- a/libvips/mosaicing/im_chkpair.c +++ b/libvips/mosaicing/im_chkpair.c @@ -56,10 +56,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_correl: * @ref: reference image diff --git a/libvips/mosaicing/im_clinear.c b/libvips/mosaicing/im_clinear.c index eae8d6df..619dd7e0 100644 --- a/libvips/mosaicing/im_clinear.c +++ b/libvips/mosaicing/im_clinear.c @@ -60,10 +60,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im__clinear( TIE_POINTS *points ) { diff --git a/libvips/mosaicing/im_improve.c b/libvips/mosaicing/im_improve.c index a9907e80..3b79486d 100644 --- a/libvips/mosaicing/im_improve.c +++ b/libvips/mosaicing/im_improve.c @@ -58,10 +58,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static void copypoints( TIE_POINTS *pnew, TIE_POINTS *pold ) { diff --git a/libvips/mosaicing/im_initialize.c b/libvips/mosaicing/im_initialize.c index 8ab66af0..61916ef5 100644 --- a/libvips/mosaicing/im_initialize.c +++ b/libvips/mosaicing/im_initialize.c @@ -36,10 +36,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im__initialize( TIE_POINTS *points ) { diff --git a/libvips/mosaicing/im_lrcalcon.c b/libvips/mosaicing/im_lrcalcon.c index 298da344..99e051ff 100644 --- a/libvips/mosaicing/im_lrcalcon.c +++ b/libvips/mosaicing/im_lrcalcon.c @@ -88,10 +88,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* A position and contrast. */ typedef struct { diff --git a/libvips/mosaicing/im_lrmerge.c b/libvips/mosaicing/im_lrmerge.c index 362f19e4..baeb17e5 100644 --- a/libvips/mosaicing/im_lrmerge.c +++ b/libvips/mosaicing/im_lrmerge.c @@ -131,10 +131,6 @@ #include "merge.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Blend luts. Shared between all lr and tb blends. */ double *im__coef1 = NULL; diff --git a/libvips/mosaicing/im_lrmosaic.c b/libvips/mosaicing/im_lrmosaic.c index e11471b1..869bd970 100644 --- a/libvips/mosaicing/im_lrmosaic.c +++ b/libvips/mosaicing/im_lrmosaic.c @@ -65,10 +65,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #ifdef DEBUG static void im__print_mdebug( TIE_POINTS *points ) diff --git a/libvips/mosaicing/im_maxpos_subpel.c b/libvips/mosaicing/im_maxpos_subpel.c index fc64abd6..cf3a75b9 100644 --- a/libvips/mosaicing/im_maxpos_subpel.c +++ b/libvips/mosaicing/im_maxpos_subpel.c @@ -42,10 +42,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC */ - #define MOST_OF( A, B ) ( (A) > 0.9 * (B) ) #define LITTLE_OF( A, B ) ( (B) < 0.1 * (B) ) diff --git a/libvips/mosaicing/im_remosaic.c b/libvips/mosaicing/im_remosaic.c index 8ef2d168..0cbc9123 100644 --- a/libvips/mosaicing/im_remosaic.c +++ b/libvips/mosaicing/im_remosaic.c @@ -55,10 +55,6 @@ #include "merge.h" #include "global_balance.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - typedef struct _RemosaicData { const char *old_str; const char *new_str; diff --git a/libvips/mosaicing/im_tbcalcon.c b/libvips/mosaicing/im_tbcalcon.c index 33d56f83..b01f94dc 100644 --- a/libvips/mosaicing/im_tbcalcon.c +++ b/libvips/mosaicing/im_tbcalcon.c @@ -76,10 +76,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im__tbcalcon( IMAGE *ref, TIE_POINTS *points ) { diff --git a/libvips/mosaicing/im_tbmerge.c b/libvips/mosaicing/im_tbmerge.c index bfddd0db..0b8c8cff 100644 --- a/libvips/mosaicing/im_tbmerge.c +++ b/libvips/mosaicing/im_tbmerge.c @@ -115,10 +115,6 @@ #include "merge.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Return the position of the first non-zero pel from the top. */ static int diff --git a/libvips/mosaicing/im_tbmosaic.c b/libvips/mosaicing/im_tbmosaic.c index 67340aa5..a1c787cd 100644 --- a/libvips/mosaicing/im_tbmosaic.c +++ b/libvips/mosaicing/im_tbmosaic.c @@ -66,10 +66,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - int im__find_tboverlap( IMAGE *ref_in, IMAGE *sec_in, IMAGE *out, int bandno_in, diff --git a/libvips/mosaicing/match.c b/libvips/mosaicing/match.c index 82b1547f..e236181d 100644 --- a/libvips/mosaicing/match.c +++ b/libvips/mosaicing/match.c @@ -39,10 +39,6 @@ #include "mosaic.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Given a pair of points, return scale, angle, dx, dy to resample the 2nd * image with. */ diff --git a/libvips/mosaicing/mosaic1.c b/libvips/mosaicing/mosaic1.c index bfa82de3..29ff6325 100644 --- a/libvips/mosaicing/mosaic1.c +++ b/libvips/mosaicing/mosaic1.c @@ -58,10 +58,6 @@ #include "mosaic.h" #include "merge.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* #define DEBUG */ diff --git a/libvips/mosaicing/mosaicing_dispatch.c b/libvips/mosaicing/mosaicing_dispatch.c index 1c8cdc7e..e8dd8ca9 100644 --- a/libvips/mosaicing/mosaicing_dispatch.c +++ b/libvips/mosaicing/mosaicing_dispatch.c @@ -42,10 +42,6 @@ #include "merge.h" -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: mosaicing * @short_description: build image mosaics diff --git a/libvips/other/im_benchmark.c b/libvips/other/im_benchmark.c index 9e1c0e14..82368ade 100644 --- a/libvips/other/im_benchmark.c +++ b/libvips/other/im_benchmark.c @@ -45,10 +45,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* VIPS SMP benchmark diff --git a/libvips/other/im_eye.c b/libvips/other/im_eye.c index 5908ddf6..65503ea0 100644 --- a/libvips/other/im_eye.c +++ b/libvips/other/im_eye.c @@ -50,10 +50,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_feye: * @out: output image diff --git a/libvips/other/im_grey.c b/libvips/other/im_grey.c index 3c0585c4..77f62f21 100644 --- a/libvips/other/im_grey.c +++ b/libvips/other/im_grey.c @@ -57,10 +57,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Generate function. */ static int diff --git a/libvips/other/im_make_xy.c b/libvips/other/im_make_xy.c index fcf08567..8a2cb6ec 100644 --- a/libvips/other/im_make_xy.c +++ b/libvips/other/im_make_xy.c @@ -43,10 +43,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Generate function. */ static int diff --git a/libvips/other/im_sines.c b/libvips/other/im_sines.c index ef4cc8fd..7a5535c1 100644 --- a/libvips/other/im_sines.c +++ b/libvips/other/im_sines.c @@ -49,10 +49,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_sines: * @out: output image diff --git a/libvips/other/im_zone.c b/libvips/other/im_zone.c index c3f3de68..b98d8b85 100644 --- a/libvips/other/im_zone.c +++ b/libvips/other/im_zone.c @@ -50,10 +50,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_fzone: * @out: output image diff --git a/libvips/other/other_dispatch.c b/libvips/other/other_dispatch.c index c6a01182..8bff01e3 100644 --- a/libvips/other/other_dispatch.c +++ b/libvips/other/other_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: other * @short_description: miscellaneous operators diff --git a/libvips/relational/im_blend.c b/libvips/relational/im_blend.c index 7e2e3172..956adeb6 100644 --- a/libvips/relational/im_blend.c +++ b/libvips/relational/im_blend.c @@ -48,10 +48,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define iblend1( TYPE ) { \ TYPE *a = (TYPE *) ap; \ TYPE *b = (TYPE *) bp; \ diff --git a/libvips/relational/im_ifthenelse.c b/libvips/relational/im_ifthenelse.c index 8a6025d5..c44be21b 100644 --- a/libvips/relational/im_ifthenelse.c +++ b/libvips/relational/im_ifthenelse.c @@ -56,10 +56,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - static int ifthenelse_gen( REGION *or, void *seq, void *client1, void *client2 ) { diff --git a/libvips/relational/relational.c b/libvips/relational/relational.c index dd934fbe..44f7ad2b 100644 --- a/libvips/relational/relational.c +++ b/libvips/relational/relational.c @@ -63,10 +63,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - #define UC IM_BANDFMT_UCHAR /* Type conversions for relational: everything goes to uchar. diff --git a/libvips/relational/relational_dispatch.c b/libvips/relational/relational_dispatch.c index 0a84f60d..ee1b5a9a 100644 --- a/libvips/relational/relational_dispatch.c +++ b/libvips/relational/relational_dispatch.c @@ -38,10 +38,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: relational * @short_description: relational comparisons between pairs of images and diff --git a/libvips/resample/im_affine.c b/libvips/resample/im_affine.c index 53088045..ec8b6cdc 100644 --- a/libvips/resample/im_affine.c +++ b/libvips/resample/im_affine.c @@ -124,10 +124,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* * FAST_PSEUDO_FLOOR is a floor and floorf replacement which has been * found to be faster on several linux boxes than the library diff --git a/libvips/resample/im_rightshift_size.c b/libvips/resample/im_rightshift_size.c index 90567506..baf71e28 100644 --- a/libvips/resample/im_rightshift_size.c +++ b/libvips/resample/im_rightshift_size.c @@ -55,10 +55,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC */ - /** LOCAL FUNCTION DECLARATIONS **/ diff --git a/libvips/resample/im_shrink.c b/libvips/resample/im_shrink.c index cfd6df62..73ce9089 100644 --- a/libvips/resample/im_shrink.c +++ b/libvips/resample/im_shrink.c @@ -66,10 +66,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Our main parameter struct. */ typedef struct { diff --git a/libvips/resample/interpolate.c b/libvips/resample/interpolate.c index ee2a753e..d98ee0db 100644 --- a/libvips/resample/interpolate.c +++ b/libvips/resample/interpolate.c @@ -57,10 +57,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: interpolate * @short_description: various interpolators: nearest, bilinear, bicubic, and diff --git a/libvips/resample/resample_dispatch.c b/libvips/resample/resample_dispatch.c index 163eabf0..5724eb4f 100644 --- a/libvips/resample/resample_dispatch.c +++ b/libvips/resample/resample_dispatch.c @@ -40,10 +40,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: resample * @short_description: shrink, expand, rotate with a choice of interpolators diff --git a/libvips/resample/transform.c b/libvips/resample/transform.c index 20abddfa..6d722910 100644 --- a/libvips/resample/transform.c +++ b/libvips/resample/transform.c @@ -46,10 +46,6 @@ #include #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Calculate the inverse transformation. */ int diff --git a/libvips/video/im_video_test.c b/libvips/video/im_video_test.c index c00eaffc..72a9d391 100644 --- a/libvips/video/im_video_test.c +++ b/libvips/video/im_video_test.c @@ -34,10 +34,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * im_video_test: * @im: write image here diff --git a/libvips/video/im_video_v4l1.c b/libvips/video/im_video_v4l1.c index 5e5816f0..fe90dad3 100644 --- a/libvips/video/im_video_v4l1.c +++ b/libvips/video/im_video_v4l1.c @@ -58,10 +58,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /* Zero freed mem to help catch stray pointers. */ #ifdef NDEBUG diff --git a/libvips/video/video_dispatch.c b/libvips/video/video_dispatch.c index 94f84c9c..f69ceb61 100644 --- a/libvips/video/video_dispatch.c +++ b/libvips/video/video_dispatch.c @@ -36,10 +36,6 @@ #include -#ifdef WITH_DMALLOC -#include -#endif /*WITH_DMALLOC*/ - /** * SECTION: video * @short_description: various video grabbers