remove dmalloc support

we never used it and valgrind etc. is better anyway
This commit is contained in:
John Cupitt 2011-09-23 17:12:47 +01:00
parent fbc3b1f608
commit ae8faf6597
285 changed files with 4 additions and 1145 deletions

View File

@ -13,6 +13,8 @@
- add the operation cache - add the operation cache
- fallback vips_init() - fallback vips_init()
- vips_tracked_malloc() tracks allocation size and can report total mem usage - 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 10/8/11 started 7.26.3
- don't use G_VALUE_COLLECT_INIT(), many platforms do not have a glib this - don't use G_VALUE_COLLECT_INIT(), many platforms do not have a glib this

10
TODO
View File

@ -1,23 +1,17 @@
- get rid of useless DMALLOC stuff
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
- do clip/embed etc. in new style, good to get everything that VipsAdd uses in - do clip/embed etc. in new style, good to get everything that VipsAdd uses in
the new stack the new stack
- im_csv2vips() gets confused by quotes and commas, eg. - im_csv2vips() gets confused by quotes and commas, eg.
NP_001121179.1,"serine proteinase inhibitor, clade A, member ",ITPNLAEFAFSLYR,0.95588235294118,0.96176470588235, ... 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 - add vips_init_argv() which processes argc/argv for you? handy for tiny
progs, perhaps progs, perhaps

View File

@ -82,10 +82,6 @@
#include "arithmetic.h" #include "arithmetic.h"
#include "binary.h" #include "binary.h"
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* VipsAdd: * VipsAdd:
* @in1: input image * @in1: input image

View File

@ -38,10 +38,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* SECTION: arithmetic * SECTION: arithmetic
* @short_description: operations which perform pixel arithmetic, trig, log, statistics * @short_description: operations which perform pixel arithmetic, trig, log, statistics

View File

@ -53,10 +53,6 @@
#include "arithmetic.h" #include "arithmetic.h"
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Properties. /* Properties.
*/ */
enum { enum {

View File

@ -74,10 +74,6 @@
#include "statistic.h" #include "statistic.h"
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* VipsAvg: * VipsAvg:
* @in: input #VipsImage * @in: input #VipsImage

View File

@ -50,10 +50,6 @@
#include "arithmetic.h" #include "arithmetic.h"
#include "binary.h" #include "binary.h"
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Properties. /* Properties.
*/ */
enum { enum {

View File

@ -62,10 +62,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Integer abs operation: just test and negate. /* Integer abs operation: just test and negate.
*/ */
#define intabs(TYPE) { \ #define intabs(TYPE) { \

View File

@ -45,10 +45,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Int types. Round, keep sum in a larger variable. /* Int types. Round, keep sum in a larger variable.
*/ */
#define ILOOP( TYPE, STYPE ) { \ #define ILOOP( TYPE, STYPE ) { \

View File

@ -48,11 +48,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* There doesn't seem to be much difference in speed between these two methods (on an Athlon64), /* 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. * so I use the modulus argument version, since atan2() is in c89 but hypot() is c99.
* *

View File

@ -69,10 +69,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
typedef struct _Wrapscan { typedef struct _Wrapscan {
IMAGE *in; IMAGE *in;
im_start_fn start; im_start_fn start;

View File

@ -67,10 +67,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Complex divide. /* Complex divide.
*/ */
#ifdef USE_MODARG_DIV #ifdef USE_MODARG_DIV

View File

@ -50,10 +50,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Invert a REGION. We are given the REGION we should write to, the REGION we /* 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 * 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. * invert_gen(), or points to the memory we should write to and ir is blank.

View File

@ -50,10 +50,6 @@
#include <math.h> #include <math.h>
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC */
/** TYPES **/ /** TYPES **/

View File

@ -75,10 +75,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Struct we need for im_generate(). /* Struct we need for im_generate().
*/ */
typedef struct { typedef struct {

View File

@ -59,10 +59,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Get the value of pixel (0, 0). Use this to init the min/max value for /* Get the value of pixel (0, 0). Use this to init the min/max value for
* im_max()/im_stats()/etc. * im_max()/im_stats()/etc.
*/ */

View File

@ -59,10 +59,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* A position and maximum. /* A position and maximum.
*/ */
typedef struct _Maxposavg { typedef struct _Maxposavg {

View File

@ -49,10 +49,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC */
/** TYPE DEFINITIONS **/ /** TYPE DEFINITIONS **/

View File

@ -57,10 +57,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Measure into array. /* Measure into array.
*/ */
static int static int

View File

@ -65,10 +65,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Complex multiply. /* Complex multiply.
*/ */
#define CLOOP( TYPE ) { \ #define CLOOP( TYPE ) { \

View File

@ -45,10 +45,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC */
/** /**
* im_point: * im_point:
* @im: image to read from * @im: image to read from

View File

@ -41,10 +41,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Inner loop. /* Inner loop.
*/ */
#define LOOP( IN, OUT ) { \ #define LOOP( IN, OUT ) { \

View File

@ -56,10 +56,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Integer remainder-after-division. /* Integer remainder-after-division.
*/ */
#define IREMAINDER( TYPE ) { \ #define IREMAINDER( TYPE ) { \

View File

@ -44,10 +44,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#define CSIGN( IN, OUT ) { \ #define CSIGN( IN, OUT ) { \
IN *p = (IN *) in; \ IN *p = (IN *) in; \
OUT *q = (OUT *) out; \ OUT *q = (OUT *) out; \

View File

@ -68,10 +68,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Track min/max/sum/sum-of-squares for each thread during a scan. /* Track min/max/sum/sum-of-squares for each thread during a scan.
*/ */
static void * static void *

View File

@ -61,10 +61,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* What we do for each band element. Non-complex only. /* What we do for each band element. Non-complex only.
*/ */
#define FUN_LOOP( IN, OUT, FUN ) { \ #define FUN_LOOP( IN, OUT, FUN ) { \

View File

@ -66,10 +66,6 @@
#include "statistic.h" #include "statistic.h"
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* VipsMin: * VipsMin:
* @in: input #VipsImage * @in: input #VipsImage

View File

@ -59,10 +59,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Operator with a single constant. /* Operator with a single constant.
*/ */
#define CONST1( IN, OUT, FUN ) { \ #define CONST1( IN, OUT, FUN ) { \

View File

@ -46,10 +46,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#define ROUND_LOOP( TYPE, FUN ) { \ #define ROUND_LOOP( TYPE, FUN ) { \
TYPE *p = (TYPE *) in; \ TYPE *p = (TYPE *) in; \
TYPE *q = (TYPE *) out; \ TYPE *q = (TYPE *) out; \

View File

@ -52,10 +52,6 @@
#include "statistic.h" #include "statistic.h"
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Properties. /* Properties.
*/ */
enum { enum {

View File

@ -77,10 +77,6 @@
#include "arithmetic.h" #include "arithmetic.h"
#include "binary.h" #include "binary.h"
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* VipsSubtract: * VipsSubtract:
* @in1: input image * @in1: input image

View File

@ -38,10 +38,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* SECTION: boolean * SECTION: boolean
* @short_description: boolean algebra on images, bitshifts * @short_description: boolean algebra on images, bitshifts

View File

@ -68,10 +68,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Save a bit of typing. /* Save a bit of typing.
*/ */
#define UC IM_BANDFMT_UCHAR #define UC IM_BANDFMT_UCHAR

View File

@ -36,10 +36,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* SECTION: cimg_funcs * SECTION: cimg_funcs
* @short_description: expose operations from the CImg library, mostly noise * @short_description: expose operations from the CImg library, mostly noise

View File

@ -67,10 +67,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Have the tables been made? /* Have the tables been made?
*/ */
static int made_ucs_tables = 0; static int made_ucs_tables = 0;

View File

@ -38,10 +38,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* SECTION: colour * SECTION: colour
* @short_description: colour operators * @short_description: colour operators

View File

@ -47,10 +47,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* im_LabQ2XYZ: * im_LabQ2XYZ:
* @in: input image * @in: input image

View File

@ -45,10 +45,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Tables we've generated, indexed by display name. /* Tables we've generated, indexed by display name.
*/ */
static GHashTable *im__col_display_tables = NULL; static GHashTable *im__col_display_tables = NULL;

View File

@ -48,10 +48,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Process a buffer of data. /* Process a buffer of data.
*/ */
void void

View File

@ -42,10 +42,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Our main loop. /* Our main loop.
*/ */
void void

View File

@ -41,10 +41,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Our main loop. /* Our main loop.
*/ */
void void

View File

@ -66,10 +66,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* @(#) convert float Lab to packed Lab32 format 10 11 11 bits /* @(#) convert float Lab to packed Lab32 format 10 11 11 bits
* works only on buffers, not IMAGEs * works only on buffers, not IMAGEs
* Copyright 1993 K.Martinez * Copyright 1993 K.Martinez

View File

@ -43,10 +43,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
void void
imb_Lab2LabS( float *in, signed short *out, int n ) imb_Lab2LabS( float *in, signed short *out, int n )
{ {

View File

@ -52,10 +52,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Process a buffer of data. /* Process a buffer of data.
*/ */
void void

View File

@ -53,10 +53,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* imb_LabQ2Lab: CONVERT n pels from packed 32bit Lab to float values /* imb_LabQ2Lab: CONVERT n pels from packed 32bit Lab to float values
* in a buffer * in a buffer
* ARGS: PEL *inp pointer to first byte of Lab32 buffer * ARGS: PEL *inp pointer to first byte of Lab32 buffer

View File

@ -45,10 +45,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* CONVERT n pels from packed 32bit Lab to signed short. /* CONVERT n pels from packed 32bit Lab to signed short.
*/ */
void void

View File

@ -46,10 +46,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Hold a display characterisation, and a set of tables /* Hold a display characterisation, and a set of tables
* computed from that. * computed from that.
*/ */

View File

@ -41,10 +41,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Convert n pels from signed short to Lab. /* Convert n pels from signed short to Lab.
*/ */
void void

View File

@ -50,10 +50,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Convert n pels from signed short to IM_CODING_LABQ. /* Convert n pels from signed short to IM_CODING_LABQ.
*/ */
void void

View File

@ -48,10 +48,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Process a buffer of data. /* Process a buffer of data.
*/ */
void void

View File

@ -57,10 +57,6 @@
#include <vips/thread.h> #include <vips/thread.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#ifndef HAVE_CBRT #ifndef HAVE_CBRT
#define cbrt( X ) pow( (X), 1.0 / 3.0 ) #define cbrt( X ) pow( (X), 1.0 / 3.0 )
#endif /*!HAVE_CBRT*/ #endif /*!HAVE_CBRT*/

View File

@ -45,10 +45,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Process a buffer of data. /* Process a buffer of data.
*/ */
void void

View File

@ -62,10 +62,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Process a buffer of data. /* Process a buffer of data.
*/ */
void void

View File

@ -45,10 +45,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Process a buffer of data. /* Process a buffer of data.
*/ */
void void

View File

@ -41,10 +41,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* A colour difference operation. /* A colour difference operation.
*/ */
int int

View File

@ -41,10 +41,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Process a buffer. /* Process a buffer.
*/ */
void void

View File

@ -42,10 +42,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Find the difference between two buffers of LAB data. /* Find the difference between two buffers of LAB data.
*/ */
void void

View File

@ -52,10 +52,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Convert a buffer. /* Convert a buffer.
*/ */
void void

View File

@ -106,10 +106,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Begin copy-paste from Radiance sources. /* Begin copy-paste from Radiance sources.
*/ */

View File

@ -68,10 +68,6 @@
#include <vips/region.h> #include <vips/region.h>
#include <vips/util.h> #include <vips/util.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* VipsIntent: * VipsIntent:
* @IM_INTENT_PERCEPTUAL: * @IM_INTENT_PERCEPTUAL:
@ -875,10 +871,6 @@ im_icc_ac2rc( IMAGE *in, IMAGE *out, const char *profile_filename )
#include <vips/region.h> #include <vips/region.h>
#include <vips/util.h> #include <vips/util.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* VipsIntent: * VipsIntent:
* @IM_INTENT_PERCEPTUAL: perceptual rendering intent * @IM_INTENT_PERCEPTUAL: perceptual rendering intent

View File

@ -46,10 +46,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
typedef struct { typedef struct {
IMAGE *in, *out; IMAGE *in, *out;

View File

@ -105,10 +105,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Begin copy-paste from Radiance sources. /* Begin copy-paste from Radiance sources.
*/ */

View File

@ -36,10 +36,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* SECTION: conversion * SECTION: conversion
* @short_description: convert images in some way: change band format, change header, insert, extract, join * @short_description: convert images in some way: change band format, change header, insert, extract, join

View File

@ -52,10 +52,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Generate function --- just black out the region. /* Generate function --- just black out the region.
*/ */
static int static int

View File

@ -56,10 +56,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#define loop(TYPE) { \ #define loop(TYPE) { \
TYPE *p = (TYPE *) in; \ TYPE *p = (TYPE *) in; \
TYPE *q = (TYPE *) out; \ TYPE *q = (TYPE *) out; \

View File

@ -49,10 +49,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#define loop(TYPE) { \ #define loop(TYPE) { \
TYPE *p = (TYPE *) in + 1; \ TYPE *p = (TYPE *) in + 1; \
TYPE *q = (TYPE *) out; \ TYPE *q = (TYPE *) out; \

View File

@ -55,10 +55,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#define loop(TYPE) { \ #define loop(TYPE) { \
TYPE *p = (TYPE *) in; \ TYPE *p = (TYPE *) in; \
TYPE *q = (TYPE *) out; \ TYPE *q = (TYPE *) out; \

View File

@ -44,10 +44,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#define loop(TYPE) { \ #define loop(TYPE) { \
TYPE *p = (TYPE *) in; \ TYPE *p = (TYPE *) in; \
TYPE *q = (TYPE *) out; \ TYPE *q = (TYPE *) out; \

View File

@ -83,10 +83,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Global state. Track over/under-flows for all sequences in this. /* Global state. Track over/under-flows for all sequences in this.
*/ */
typedef struct { typedef struct {

View File

@ -83,10 +83,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Copy a small area. /* Copy a small area.
*/ */
static int static int

View File

@ -47,10 +47,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* im_copy_file: * im_copy_file:
* @in: input image * @in: input image

View File

@ -60,10 +60,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Per-call struct. /* Per-call struct.
*/ */
typedef struct _Embed { typedef struct _Embed {

View File

@ -72,10 +72,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
typedef struct _Extract { typedef struct _Extract {
IMAGE *in; IMAGE *in;
IMAGE *out; IMAGE *out;

View File

@ -50,10 +50,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Falsecolour scale nicked from a PET scan. /* Falsecolour scale nicked from a PET scan.
*/ */
static unsigned char PET_colour[][3] = { static unsigned char PET_colour[][3] = {

View File

@ -52,10 +52,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Flip a small area. /* Flip a small area.
*/ */
static int static int

View File

@ -55,10 +55,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Flip a small area. /* Flip a small area.
*/ */
static int static int

View File

@ -56,10 +56,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Keep parameters here. /* Keep parameters here.
*/ */
typedef struct { typedef struct {

View File

@ -61,10 +61,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Struct we carry stuff around in. /* Struct we carry stuff around in.
*/ */
typedef struct joins { typedef struct joins {

View File

@ -45,10 +45,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
typedef struct _Grid { typedef struct _Grid {
IMAGE *in; IMAGE *in;
IMAGE *out; IMAGE *out;

View File

@ -65,10 +65,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* The common part of most binary conversion /* The common part of most binary conversion
* operators. We: * operators. We:
* *

View File

@ -57,10 +57,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* im_lrjoin: * im_lrjoin:

View File

@ -45,10 +45,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* im_mask2vips: * im_mask2vips:
* @in: input mask * @in: input mask

View File

@ -50,10 +50,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC */
typedef struct _Msb { typedef struct _Msb {
size_t index; size_t index;
size_t width; size_t width;

View File

@ -51,10 +51,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
static int static int
replicate_gen( REGION *or, void *seq, void *a, void *b ) replicate_gen( REGION *or, void *seq, void *a, void *b )
{ {

View File

@ -52,10 +52,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#include <vips/internal.h> #include <vips/internal.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#define JOIN( TYPE ) { \ #define JOIN( TYPE ) { \
TYPE *p1 = (TYPE *) p[0]; \ TYPE *p1 = (TYPE *) p[0]; \
TYPE *p2 = (TYPE *) p[1]; \ TYPE *p2 = (TYPE *) p[1]; \

View File

@ -62,10 +62,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
static int static int
rot180_gen( REGION *or, void *seq, void *a, void *b ) rot180_gen( REGION *or, void *seq, void *a, void *b )
{ {

View File

@ -63,10 +63,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Rotate a small piece. /* Rotate a small piece.
*/ */
static int static int

View File

@ -63,10 +63,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Rotate a small piece. /* Rotate a small piece.
*/ */
static int static int

View File

@ -53,10 +53,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* im_scale: * im_scale:
* @in: input image * @in: input image

View File

@ -55,10 +55,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* im_scaleps: * im_scaleps:
* @in: input image * @in: input image

View File

@ -47,10 +47,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Maximum width of input we ask for. /* Maximum width of input we ask for.
*/ */
#define IM_MAX_WIDTH (100) #define IM_MAX_WIDTH (100)

View File

@ -59,10 +59,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#define IM_MAX_STRSIZE (4096) #define IM_MAX_STRSIZE (4096)
/** /**

View File

@ -49,10 +49,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#define IM_MAX_STRSIZE (4096) #define IM_MAX_STRSIZE (4096)
static int static int

View File

@ -57,10 +57,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* im_tbjoin: * im_tbjoin:
* @top: image to go on top * @top: image to go on top

View File

@ -53,10 +53,6 @@
#include <pango/pangoft2.h> #include <pango/pangoft2.h>
#endif /*HAVE_PANGOFT2*/ #endif /*HAVE_PANGOFT2*/
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
#ifdef HAVE_PANGOFT2 #ifdef HAVE_PANGOFT2
static PangoLayout * static PangoLayout *

View File

@ -48,10 +48,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* im_vips2mask: * im_vips2mask:
* @in: input image * @in: input image

View File

@ -42,10 +42,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* im_wrap: * im_wrap:
* @in: input image * @in: input image

View File

@ -77,10 +77,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Round N down to P boundary. /* Round N down to P boundary.
*/ */
#define ROUND_DOWN(N,P) ((N) - ((N) % P)) #define ROUND_DOWN(N,P) ((N) - ((N) % P))

View File

@ -38,10 +38,6 @@
#include <vips/vips.h> #include <vips/vips.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/** /**
* SECTION: convolution * SECTION: convolution
* @short_description: convolve and correlate images * @short_description: convolve and correlate images

View File

@ -91,10 +91,6 @@ $ vips im_max abs.v
#include <vips/vector.h> #include <vips/vector.h>
#include <vips/debug.h> #include <vips/debug.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* Maximum number of boxes we can break the mask into. /* Maximum number of boxes we can break the mask into.
*/ */
#define MAX_LINES (10000) #define MAX_LINES (10000)

Some files were not shown because too many files have changed in this diff Show More