remove dmalloc support
we never used it and valgrind etc. is better anyway
This commit is contained in:
parent
fbc3b1f608
commit
ae8faf6597
|
@ -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
|
||||
|
|
10
TODO
10
TODO
|
@ -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
|
||||
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
|
||||
|
||||
|
|
|
@ -82,10 +82,6 @@
|
|||
#include "arithmetic.h"
|
||||
#include "binary.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* VipsAdd:
|
||||
* @in1: input image
|
||||
|
|
|
@ -38,10 +38,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* SECTION: arithmetic
|
||||
* @short_description: operations which perform pixel arithmetic, trig, log, statistics
|
||||
|
|
|
@ -53,10 +53,6 @@
|
|||
|
||||
#include "arithmetic.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Properties.
|
||||
*/
|
||||
enum {
|
||||
|
|
|
@ -74,10 +74,6 @@
|
|||
|
||||
#include "statistic.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* VipsAvg:
|
||||
* @in: input #VipsImage
|
||||
|
|
|
@ -50,10 +50,6 @@
|
|||
#include "arithmetic.h"
|
||||
#include "binary.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Properties.
|
||||
*/
|
||||
enum {
|
||||
|
|
|
@ -62,10 +62,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Integer abs operation: just test and negate.
|
||||
*/
|
||||
#define intabs(TYPE) { \
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Int types. Round, keep sum in a larger variable.
|
||||
*/
|
||||
#define ILOOP( TYPE, STYPE ) { \
|
||||
|
|
|
@ -48,11 +48,6 @@
|
|||
|
||||
#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),
|
||||
* so I use the modulus argument version, since atan2() is in c89 but hypot() is c99.
|
||||
*
|
||||
|
|
|
@ -69,10 +69,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
typedef struct _Wrapscan {
|
||||
IMAGE *in;
|
||||
im_start_fn start;
|
||||
|
|
|
@ -67,10 +67,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Complex divide.
|
||||
*/
|
||||
#ifdef USE_MODARG_DIV
|
||||
|
|
|
@ -50,10 +50,6 @@
|
|||
|
||||
#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
|
||||
* 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.
|
||||
|
|
|
@ -50,10 +50,6 @@
|
|||
#include <math.h>
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC */
|
||||
|
||||
|
||||
/** TYPES **/
|
||||
|
||||
|
|
|
@ -75,10 +75,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Struct we need for im_generate().
|
||||
*/
|
||||
typedef struct {
|
||||
|
|
|
@ -59,10 +59,6 @@
|
|||
#include <vips/vips.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
|
||||
* im_max()/im_stats()/etc.
|
||||
*/
|
||||
|
|
|
@ -59,10 +59,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* A position and maximum.
|
||||
*/
|
||||
typedef struct _Maxposavg {
|
||||
|
|
|
@ -49,10 +49,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC */
|
||||
|
||||
|
||||
/** TYPE DEFINITIONS **/
|
||||
|
||||
|
|
|
@ -57,10 +57,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Measure into array.
|
||||
*/
|
||||
static int
|
||||
|
|
|
@ -65,10 +65,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Complex multiply.
|
||||
*/
|
||||
#define CLOOP( TYPE ) { \
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC */
|
||||
|
||||
/**
|
||||
* im_point:
|
||||
* @im: image to read from
|
||||
|
|
|
@ -41,10 +41,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Inner loop.
|
||||
*/
|
||||
#define LOOP( IN, OUT ) { \
|
||||
|
|
|
@ -56,10 +56,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Integer remainder-after-division.
|
||||
*/
|
||||
#define IREMAINDER( TYPE ) { \
|
||||
|
|
|
@ -44,10 +44,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#define CSIGN( IN, OUT ) { \
|
||||
IN *p = (IN *) in; \
|
||||
OUT *q = (OUT *) out; \
|
||||
|
|
|
@ -68,10 +68,6 @@
|
|||
#include <vips/vips.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.
|
||||
*/
|
||||
static void *
|
||||
|
|
|
@ -61,10 +61,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* What we do for each band element. Non-complex only.
|
||||
*/
|
||||
#define FUN_LOOP( IN, OUT, FUN ) { \
|
||||
|
|
|
@ -66,10 +66,6 @@
|
|||
|
||||
#include "statistic.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* VipsMin:
|
||||
* @in: input #VipsImage
|
||||
|
|
|
@ -59,10 +59,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Operator with a single constant.
|
||||
*/
|
||||
#define CONST1( IN, OUT, FUN ) { \
|
||||
|
|
|
@ -46,10 +46,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#define ROUND_LOOP( TYPE, FUN ) { \
|
||||
TYPE *p = (TYPE *) in; \
|
||||
TYPE *q = (TYPE *) out; \
|
||||
|
|
|
@ -52,10 +52,6 @@
|
|||
|
||||
#include "statistic.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Properties.
|
||||
*/
|
||||
enum {
|
||||
|
|
|
@ -77,10 +77,6 @@
|
|||
#include "arithmetic.h"
|
||||
#include "binary.h"
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* VipsSubtract:
|
||||
* @in1: input image
|
||||
|
|
|
@ -38,10 +38,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* SECTION: boolean
|
||||
* @short_description: boolean algebra on images, bitshifts
|
||||
|
|
|
@ -68,10 +68,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Save a bit of typing.
|
||||
*/
|
||||
#define UC IM_BANDFMT_UCHAR
|
||||
|
|
|
@ -36,10 +36,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* SECTION: cimg_funcs
|
||||
* @short_description: expose operations from the CImg library, mostly noise
|
||||
|
|
|
@ -67,10 +67,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Have the tables been made?
|
||||
*/
|
||||
static int made_ucs_tables = 0;
|
||||
|
|
|
@ -38,10 +38,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* SECTION: colour
|
||||
* @short_description: colour operators
|
||||
|
|
|
@ -47,10 +47,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* im_LabQ2XYZ:
|
||||
* @in: input image
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Tables we've generated, indexed by display name.
|
||||
*/
|
||||
static GHashTable *im__col_display_tables = NULL;
|
||||
|
|
|
@ -48,10 +48,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Process a buffer of data.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -42,10 +42,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Our main loop.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -41,10 +41,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Our main loop.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -66,10 +66,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* @(#) convert float Lab to packed Lab32 format 10 11 11 bits
|
||||
* works only on buffers, not IMAGEs
|
||||
* Copyright 1993 K.Martinez
|
||||
|
|
|
@ -43,10 +43,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
void
|
||||
imb_Lab2LabS( float *in, signed short *out, int n )
|
||||
{
|
||||
|
|
|
@ -52,10 +52,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Process a buffer of data.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -53,10 +53,6 @@
|
|||
|
||||
#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
|
||||
* in a buffer
|
||||
* ARGS: PEL *inp pointer to first byte of Lab32 buffer
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* CONVERT n pels from packed 32bit Lab to signed short.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -46,10 +46,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Hold a display characterisation, and a set of tables
|
||||
* computed from that.
|
||||
*/
|
||||
|
|
|
@ -41,10 +41,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Convert n pels from signed short to Lab.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -50,10 +50,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Convert n pels from signed short to IM_CODING_LABQ.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -48,10 +48,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Process a buffer of data.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -57,10 +57,6 @@
|
|||
#include <vips/thread.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#ifndef HAVE_CBRT
|
||||
#define cbrt( X ) pow( (X), 1.0 / 3.0 )
|
||||
#endif /*!HAVE_CBRT*/
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Process a buffer of data.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -62,10 +62,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Process a buffer of data.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Process a buffer of data.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -41,10 +41,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* A colour difference operation.
|
||||
*/
|
||||
int
|
||||
|
|
|
@ -41,10 +41,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Process a buffer.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -42,10 +42,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Find the difference between two buffers of LAB data.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -52,10 +52,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Convert a buffer.
|
||||
*/
|
||||
void
|
||||
|
|
|
@ -106,10 +106,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Begin copy-paste from Radiance sources.
|
||||
*/
|
||||
|
||||
|
|
|
@ -68,10 +68,6 @@
|
|||
#include <vips/region.h>
|
||||
#include <vips/util.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* VipsIntent:
|
||||
* @IM_INTENT_PERCEPTUAL:
|
||||
|
@ -875,10 +871,6 @@ im_icc_ac2rc( IMAGE *in, IMAGE *out, const char *profile_filename )
|
|||
#include <vips/region.h>
|
||||
#include <vips/util.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* VipsIntent:
|
||||
* @IM_INTENT_PERCEPTUAL: perceptual rendering intent
|
||||
|
|
|
@ -46,10 +46,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
typedef struct {
|
||||
IMAGE *in, *out;
|
||||
|
||||
|
|
|
@ -105,10 +105,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Begin copy-paste from Radiance sources.
|
||||
*/
|
||||
|
||||
|
|
|
@ -36,10 +36,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* SECTION: conversion
|
||||
* @short_description: convert images in some way: change band format, change header, insert, extract, join
|
||||
|
|
|
@ -52,10 +52,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Generate function --- just black out the region.
|
||||
*/
|
||||
static int
|
||||
|
|
|
@ -56,10 +56,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#define loop(TYPE) { \
|
||||
TYPE *p = (TYPE *) in; \
|
||||
TYPE *q = (TYPE *) out; \
|
||||
|
|
|
@ -49,10 +49,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#define loop(TYPE) { \
|
||||
TYPE *p = (TYPE *) in + 1; \
|
||||
TYPE *q = (TYPE *) out; \
|
||||
|
|
|
@ -55,10 +55,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#define loop(TYPE) { \
|
||||
TYPE *p = (TYPE *) in; \
|
||||
TYPE *q = (TYPE *) out; \
|
||||
|
|
|
@ -44,10 +44,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#define loop(TYPE) { \
|
||||
TYPE *p = (TYPE *) in; \
|
||||
TYPE *q = (TYPE *) out; \
|
||||
|
|
|
@ -83,10 +83,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Global state. Track over/under-flows for all sequences in this.
|
||||
*/
|
||||
typedef struct {
|
||||
|
|
|
@ -83,10 +83,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Copy a small area.
|
||||
*/
|
||||
static int
|
||||
|
|
|
@ -47,10 +47,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* im_copy_file:
|
||||
* @in: input image
|
||||
|
|
|
@ -60,10 +60,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Per-call struct.
|
||||
*/
|
||||
typedef struct _Embed {
|
||||
|
|
|
@ -72,10 +72,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
typedef struct _Extract {
|
||||
IMAGE *in;
|
||||
IMAGE *out;
|
||||
|
|
|
@ -50,10 +50,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Falsecolour scale nicked from a PET scan.
|
||||
*/
|
||||
static unsigned char PET_colour[][3] = {
|
||||
|
|
|
@ -52,10 +52,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Flip a small area.
|
||||
*/
|
||||
static int
|
||||
|
|
|
@ -55,10 +55,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Flip a small area.
|
||||
*/
|
||||
static int
|
||||
|
|
|
@ -56,10 +56,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Keep parameters here.
|
||||
*/
|
||||
typedef struct {
|
||||
|
|
|
@ -61,10 +61,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Struct we carry stuff around in.
|
||||
*/
|
||||
typedef struct joins {
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
typedef struct _Grid {
|
||||
IMAGE *in;
|
||||
IMAGE *out;
|
||||
|
|
|
@ -65,10 +65,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* The common part of most binary conversion
|
||||
* operators. We:
|
||||
*
|
||||
|
|
|
@ -57,10 +57,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
|
||||
/**
|
||||
* im_lrjoin:
|
||||
|
|
|
@ -45,10 +45,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* im_mask2vips:
|
||||
* @in: input mask
|
||||
|
|
|
@ -50,10 +50,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC */
|
||||
|
||||
typedef struct _Msb {
|
||||
size_t index;
|
||||
size_t width;
|
||||
|
|
|
@ -51,10 +51,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
static int
|
||||
replicate_gen( REGION *or, void *seq, void *a, void *b )
|
||||
{
|
||||
|
|
|
@ -52,10 +52,6 @@
|
|||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#define JOIN( TYPE ) { \
|
||||
TYPE *p1 = (TYPE *) p[0]; \
|
||||
TYPE *p2 = (TYPE *) p[1]; \
|
||||
|
|
|
@ -62,10 +62,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
static int
|
||||
rot180_gen( REGION *or, void *seq, void *a, void *b )
|
||||
{
|
||||
|
|
|
@ -63,10 +63,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Rotate a small piece.
|
||||
*/
|
||||
static int
|
||||
|
|
|
@ -63,10 +63,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Rotate a small piece.
|
||||
*/
|
||||
static int
|
||||
|
|
|
@ -53,10 +53,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* im_scale:
|
||||
* @in: input image
|
||||
|
|
|
@ -55,10 +55,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* im_scaleps:
|
||||
* @in: input image
|
||||
|
|
|
@ -47,10 +47,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Maximum width of input we ask for.
|
||||
*/
|
||||
#define IM_MAX_WIDTH (100)
|
||||
|
|
|
@ -59,10 +59,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#define IM_MAX_STRSIZE (4096)
|
||||
|
||||
/**
|
||||
|
|
|
@ -49,10 +49,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#define IM_MAX_STRSIZE (4096)
|
||||
|
||||
static int
|
||||
|
|
|
@ -57,10 +57,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* im_tbjoin:
|
||||
* @top: image to go on top
|
||||
|
|
|
@ -53,10 +53,6 @@
|
|||
#include <pango/pangoft2.h>
|
||||
#endif /*HAVE_PANGOFT2*/
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
#ifdef HAVE_PANGOFT2
|
||||
|
||||
static PangoLayout *
|
||||
|
|
|
@ -48,10 +48,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* im_vips2mask:
|
||||
* @in: input image
|
||||
|
|
|
@ -42,10 +42,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* im_wrap:
|
||||
* @in: input image
|
||||
|
|
|
@ -77,10 +77,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Round N down to P boundary.
|
||||
*/
|
||||
#define ROUND_DOWN(N,P) ((N) - ((N) % P))
|
||||
|
|
|
@ -38,10 +38,6 @@
|
|||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/**
|
||||
* SECTION: convolution
|
||||
* @short_description: convolve and correlate images
|
||||
|
|
|
@ -91,10 +91,6 @@ $ vips im_max abs.v
|
|||
#include <vips/vector.h>
|
||||
#include <vips/debug.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
#endif /*WITH_DMALLOC*/
|
||||
|
||||
/* Maximum number of boxes we can break the mask into.
|
||||
*/
|
||||
#define MAX_LINES (10000)
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue