This commit is contained in:
John Cupitt 2010-01-13 12:30:50 +00:00
parent 510801ec15
commit 00a00be432
6 changed files with 917 additions and 468 deletions

View File

@ -14,6 +14,7 @@
- added im_system_image() (thanks Roland)
- added postclose callbacks
- added vipsthumbnail
- oops, generate C++/Python wrappers for deprecated operations by default
26/11/09 started 7.20.3
- updated en_GB.po translation

View File

@ -359,36 +359,6 @@ static im_function similarity_area_desc = {
similarity_area_args /* Arg list */
};
/* Call im_remainderconst_vec via arg vector.
*/
static int
remainderconst_vec_vec( im_object *argv )
{
im_doublevec_object *dv = (im_doublevec_object *) argv[2];
return( im_remainder_vec( argv[0], argv[1], dv->n, dv->vec ) );
}
/* Args for im_remainderconst_vec().
*/
static im_arg_desc remainderconst_vec_args[] = {
IM_INPUT_IMAGE( "in" ),
IM_OUTPUT_IMAGE( "out" ),
IM_INPUT_DOUBLEVEC( "x" )
};
/* Description of im_remainderconst_vec.
*/
static im_function remainderconst_vec_desc = {
"im_remainderconst_vec", /* Name */
N_( "remainder after integer division by a vector of constants" ),
/* Description */
IM_FN_PIO | IM_FN_PTOP, /* Flags */
remainderconst_vec_vec, /* Dispatch function */
IM_NUMBER( remainderconst_vec_args ),/* Size of arg list */
remainderconst_vec_args /* Arg list */
};
static int
icc_export_vec( im_object *argv )
{
@ -1215,7 +1185,6 @@ static im_function convf_desc = {
static im_function *deprecated_list[] = {
&resize_linear_desc,
&cmulnorm_desc,
&remainderconst_vec_desc,
&fav4_desc,
&gadd_desc,
&icc_export_desc,

View File

@ -21,10 +21,13 @@ libvipsCC_la_LDFLAGS = \
libvipsCC_la_LIBADD = \
$(top_builddir)/libvips/libvips.la @VIPS_LIBS@
# swap the 'awk' line for this:
# awk '{if($$1!="deprecated") print $$1}'` ; \
# to not generate the wrappers for deprecated functions
.PHONEY:
vipsc++.cc:
packages=`vips --list packages | \
awk '{if($$1!="deprecated") print $$1}'` ; \
awk '{print $$1}'` ; \
echo > vipsc++.cc ; \
for name in $$packages; do \
echo "// bodies for package $$name" >> vipsc++.cc ; \

View File

@ -7,10 +7,13 @@ pkginclude_HEADERS = \
vips \
vipsc++.h
# swap the 'awk' line for this:
# awk '{if($$1!="deprecated") print $$1}'` ; \
# to not generate the wrappers for deprecated functions
.PHONEY:
vipsc++.h:
packages=`vips --list packages | \
awk '{if($$1!="deprecated") print $$1}'` ; \
awk '{print $$1}'` ; \
echo > vipsc++.h ; \
for name in $$packages; do \
echo "// headers for package $$name" >> vipsc++.h ; \

View File

@ -1,7 +1,7 @@
// headers for package arithmetic
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage abs() throw( VError );
VImage acos() throw( VError );
VImage add( VImage ) throw( VError );
@ -11,6 +11,7 @@ double avg() throw( VError );
double point_bilinear( double, double, int ) throw( VError );
VImage bandmean() throw( VError );
VImage ceil() throw( VError );
VImage cmulnorm( VImage ) throw( VError );
VImage cos() throw( VError );
VImage cross_phase( VImage ) throw( VError );
double deviate() throw( VError );
@ -19,11 +20,14 @@ VImage exp10() throw( VError );
VImage expn( double ) throw( VError );
VImage expn( std::vector<double> ) throw( VError );
VImage exp() throw( VError );
VImage fav4( VImage, VImage, VImage ) throw( VError );
VImage floor() throw( VError );
VImage gadd( double, double, VImage, double ) throw( VError );
VImage invert() throw( VError );
VImage lin( double, double ) throw( VError );
static VImage linreg( std::vector<VImage>, std::vector<double> ) throw( VError );
VImage lin( std::vector<double>, std::vector<double> ) throw( VError );
VImage litecor( VImage, int, double ) throw( VError );
VImage log10() throw( VError );
VImage log() throw( VError );
double max() throw( VError );
@ -35,7 +39,6 @@ std::complex<double> minpos() throw( VError );
VImage multiply( VImage ) throw( VError );
VImage pow( double ) throw( VError );
VImage pow( std::vector<double> ) throw( VError );
VImage recomb( VDMask ) throw( VError );
VImage remainder( VImage ) throw( VError );
VImage remainder( double ) throw( VError );
VImage remainder( std::vector<double> ) throw( VError );
@ -48,7 +51,7 @@ VImage tan() throw( VError );
// headers for package boolean
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage andimage( VImage ) throw( VError );
VImage andimage( int ) throw( VError );
VImage andimage( std::vector<double> ) throw( VError );
@ -58,20 +61,18 @@ VImage orimage( std::vector<double> ) throw( VError );
VImage eorimage( VImage ) throw( VError );
VImage eorimage( int ) throw( VError );
VImage eorimage( std::vector<double> ) throw( VError );
VImage shiftleft( std::vector<double> ) throw( VError );
VImage shiftleft( int ) throw( VError );
VImage shiftright( std::vector<double> ) throw( VError );
VImage shiftright( int ) throw( VError );
// headers for package cimg
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage greyc( int, double, double, double, double, double, double, double, double, int, int ) throw( VError );
VImage greyc_mask( VImage, int, double, double, double, double, double, double, double, double, int, int ) throw( VError );
// headers for package colour
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage LCh2Lab() throw( VError );
VImage LCh2UCS() throw( VError );
VImage Lab2LCh() throw( VError );
@ -107,6 +108,7 @@ VImage disp2Lab( VDisplay ) throw( VError );
VImage disp2XYZ( VDisplay ) throw( VError );
VImage float2rad() throw( VError );
VImage icc_ac2rc( char* ) throw( VError );
VImage icc_export( char*, int ) throw( VError );
VImage icc_export_depth( int, char*, int ) throw( VError );
VImage icc_import( char*, int ) throw( VError );
VImage icc_import_embedded( int ) throw( VError );
@ -117,9 +119,7 @@ VImage sRGB2XYZ() throw( VError );
// headers for package conversion
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
VImage addgnoise( double ) throw( VError );
static VImage gaussnoise( int, int, double, double ) throw( VError );
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage bandjoin( VImage ) throw( VError );
static VImage black( int, int, int ) throw( VError );
VImage c2amph() throw( VError );
@ -127,13 +127,21 @@ VImage c2imag() throw( VError );
VImage c2ps() throw( VError );
VImage c2real() throw( VError );
VImage c2rect() throw( VError );
VImage clip() throw( VError );
VImage clip2c() throw( VError );
VImage clip2cm() throw( VError );
VImage clip2d() throw( VError );
VImage clip2dcm() throw( VError );
VImage clip2f() throw( VError );
VImage clip2fmt( int ) throw( VError );
VImage clip2i() throw( VError );
VImage clip2s() throw( VError );
VImage clip2ui() throw( VError );
VImage clip2us() throw( VError );
VImage clip() throw( VError );
VImage copy() throw( VError );
VImage copy_file() throw( VError );
VImage copy_morph( int, int, int ) throw( VError );
VImage copy_swap() throw( VError );
VImage copy_( int, double, double, int, int ) throw( VError );
VImage copy_set( int, double, double, int, int ) throw( VError );
VImage extract_area( int, int, int, int ) throw( VError );
VImage extract_areabands( int, int, int, int, int, int ) throw( VError );
VImage extract_band( int ) throw( VError );
@ -145,13 +153,12 @@ VImage flipver() throw( VError );
static VImage gbandjoin( std::vector<VImage> ) throw( VError );
VImage grid( int, int, int ) throw( VError );
VImage insert( VImage, int, int ) throw( VError );
VImage insert( VImage, std::vector<int>, std::vector<int> ) throw( VError );
VImage insert_noexpand( VImage, int, int ) throw( VError );
VImage embed( int, int, int, int, int ) throw( VError );
VImage lrjoin( VImage ) throw( VError );
static VImage mask2vips( VDMask ) throw( VError );
VImage msb() throw( VError );
VImage msb_band( int ) throw( VError );
VImage recomb( VDMask ) throw( VError );
VImage replicate( int, int ) throw( VError );
VImage ri2c( VImage ) throw( VError );
VImage rot180() throw( VError );
@ -159,35 +166,60 @@ VImage rot270() throw( VError );
VImage rot90() throw( VError );
VImage scale() throw( VError );
VImage scaleps() throw( VError );
VImage rightshift_size( int, int, int ) throw( VError );
VImage slice( double, double ) throw( VError );
VImage subsample( int, int ) throw( VError );
char* system( char* ) throw( VError );
VImage tbjoin( VImage ) throw( VError );
static VImage text( char*, char*, int, int, int ) throw( VError );
VImage thresh( double ) throw( VError );
VDMask vips2mask() throw( VError );
VImage wrap( int, int ) throw( VError );
VImage zoom( int, int ) throw( VError );
// headers for package convolution
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage addgnoise( double ) throw( VError );
VImage compass( VIMask ) throw( VError );
VImage contrast_surface( int, int ) throw( VError );
VImage contrast_surface_raw( int, int ) throw( VError );
VImage conv( VIMask ) throw( VError );
VImage conv( VDMask ) throw( VError );
VImage conv_raw( VIMask ) throw( VError );
VImage convf( VDMask ) throw( VError );
VImage convf_raw( VDMask ) throw( VError );
VImage convsep( VIMask ) throw( VError );
VImage convsep( VDMask ) throw( VError );
VImage convsep_raw( VIMask ) throw( VError );
VImage convsepf( VDMask ) throw( VError );
VImage convsepf_raw( VDMask ) throw( VError );
VImage convsub( VIMask, int, int ) throw( VError );
VImage embed( int, int, int, int, int ) throw( VError );
VImage fastcor( VImage ) throw( VError );
VImage gradcor( VImage ) throw( VError );
VImage gradient( VIMask ) throw( VError );
VImage fastcor_raw( VImage ) throw( VError );
static VImage gaussnoise( int, int, double, double ) throw( VError );
VImage grad_x() throw( VError );
VImage grad_y() throw( VError );
VImage gradcor( VImage ) throw( VError );
VImage gradcor_raw( VImage ) throw( VError );
VImage gradient( VIMask ) throw( VError );
static VImage rank_image( std::vector<VImage>, int ) throw( VError );
VImage lindetect( VIMask ) throw( VError );
static VImage maxvalue( std::vector<VImage> ) throw( VError );
int mpercent( double ) throw( VError );
VImage phasecor_fft( VImage ) throw( VError );
VImage rank( int, int, int ) throw( VError );
VImage rank_raw( int, int, int ) throw( VError );
VImage resize_linear( int, int ) throw( VError );
VImage sharpen( int, double, double, double, double, double ) throw( VError );
VImage shrink( double, double ) throw( VError );
VImage spcor( VImage ) throw( VError );
VImage spcor_raw( VImage ) throw( VError );
VImage stretch3( double, double ) throw( VError );
VImage zerox( int ) throw( VError );
// headers for package format
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
static VImage csv2vips( char* ) throw( VError );
static VImage jpeg2vips( char* ) throw( VError );
static VImage magick2vips( char* ) throw( VError );
@ -205,7 +237,7 @@ void vips2tiff( char* ) throw( VError );
// headers for package freq_filt
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
static VImage create_fmask( int, int, int, double, double, double, double, double ) throw( VError );
VImage disp_ps() throw( VError );
VImage flt_image_freq( int, double, double, double, double, double ) throw( VError );
@ -214,18 +246,16 @@ VImage freqflt( VImage ) throw( VError );
VImage fwfft() throw( VError );
VImage rotquad() throw( VError );
VImage invfft() throw( VError );
VImage phasecor_fft( VImage ) throw( VError );
VImage invfftr() throw( VError );
// headers for package histograms_lut
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage gammacorrect( double ) throw( VError );
VImage heq( int ) throw( VError );
VImage hist( int ) throw( VError );
VImage histcum() throw( VError );
VImage histeq() throw( VError );
VImage hist_indexed( VImage ) throw( VError );
VImage histgr( int ) throw( VError );
VImage histnD( int ) throw( VError );
VImage histnorm() throw( VError );
@ -236,12 +266,13 @@ static VImage identity( int ) throw( VError );
static VImage identity_ushort( int, int ) throw( VError );
int ismonotonic() throw( VError );
VImage lhisteq( int, int ) throw( VError );
int mpercent( double ) throw( VError );
VImage lhisteq_raw( int, int ) throw( VError );
static VImage invertlut( VDMask, int ) throw( VError );
static VImage buildlut( VDMask ) throw( VError );
VImage maplut( VImage ) throw( VError );
VImage project( VImage& ) throw( VError );
VImage stdif( double, double, double, double, int, int ) throw( VError );
VImage stdif_raw( double, double, double, double, int, int ) throw( VError );
VImage tone_analyse( double, double, double, double, double, double ) throw( VError );
static VImage tone_build( double, double, double, double, double, double, double, double ) throw( VError );
static VImage tone_build_range( int, int, double, double, double, double, double, double, double, double ) throw( VError );
@ -249,46 +280,40 @@ VImage tone_map( VImage ) throw( VError );
// headers for package inplace
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
void circle( int, int, int, int ) throw( VError );
VImage flood_blob_copy( int, int, std::vector<double> ) throw( VError );
VImage flood_other_copy( VImage, int, int, int ) throw( VError );
void insertplace( VImage, int, int ) throw( VError );
VImage line( VImage, VImage, std::vector<int>, std::vector<int>, std::vector<int>, std::vector<int> ) throw( VError );
void line( int, int, int, int, int ) throw( VError );
VImage lineset( VImage, VImage, std::vector<int>, std::vector<int>, std::vector<int>, std::vector<int> ) throw( VError );
// headers for package iofuncs
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
static VImage binfile( char*, int, int, int, int ) throw( VError );
VImage cache( int, int, int ) throw( VError );
char* getext() throw( VError );
int header_get_typeof( char* ) throw( VError );
int header_get_type( char* ) throw( VError );
int header_int( char* ) throw( VError );
double header_double( char* ) throw( VError );
char* header_string( char* ) throw( VError );
char* history_get() throw( VError );
void printdesc() throw( VError );
// headers for package mask
// headers for package matrix
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
// headers for package morphology
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
double cntlines( int ) throw( VError );
VImage dilate( VIMask ) throw( VError );
VImage rank( int, int, int ) throw( VError );
static VImage rank_image( std::vector<VImage>, int ) throw( VError );
static VImage maxvalue( std::vector<VImage> ) throw( VError );
VImage label_regions( int& ) throw( VError );
VImage zerox( int ) throw( VError );
VImage dilate_raw( VIMask ) throw( VError );
VImage erode( VIMask ) throw( VError );
VImage erode_raw( VIMask ) throw( VError );
VImage profile( int ) throw( VError );
// headers for package mosaicing
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage align_bands() throw( VError );
double correl( VImage, int, int, int, int, int, int, int&, int& ) throw( VError );
int _find_lroverlap( VImage, int, int, int, int, int, int, int, int&, double&, double&, double&, double& ) throw( VError );
@ -310,7 +335,7 @@ VImage tbmosaic1( VImage, int, int, int, int, int, int, int, int, int, int, int,
// headers for package other
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage benchmark() throw( VError );
double benchmark2() throw( VError );
VImage benchmarkn( int ) throw( VError );
@ -324,7 +349,7 @@ static VImage zone( int ) throw( VError );
// headers for package relational
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage blend( VImage, VImage ) throw( VError );
VImage equal( VImage ) throw( VError );
VImage equal( std::vector<double> ) throw( VError );
@ -348,14 +373,14 @@ VImage notequal( double ) throw( VError );
// headers for package resample
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
VImage rightshift_size( int, int, int ) throw( VError );
VImage shrink( double, double ) throw( VError );
VImage stretch3( double, double ) throw( VError );
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
VImage affine( double, double, double, double, double, double, int, int, int, int ) throw( VError );
VImage similarity_area( double, double, double, double, int, int, int, int ) throw( VError );
VImage similarity( double, double, double, double ) throw( VError );
// headers for package video
// this file automatically generated from
// VIPS library 7.20.1-Fri Nov 13 11:00:09 GMT 2009
// VIPS library 7.18.1-Tue Sep 8 04:54:03 UTC 2009
static VImage video_test( int, int ) throw( VError );
static VImage video_v4l1( char*, int, int, int, int, int, int ) throw( VError );

File diff suppressed because it is too large Load Diff