sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
John Cupitt 2010-11-19 14:53:11 +00:00
parent 4d0fd160a0
commit 0a9ca45f6d
4 changed files with 273 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -47,6 +47,7 @@
- im_rank_image() works for mix of formats, bands - im_rank_image() works for mix of formats, bands
- morph gtk-doc done - morph gtk-doc done
- oops, missing braces in debug.h and util.h, thanks Laurence - oops, missing braces in debug.h and util.h, thanks Laurence
- update C++/Python binding
12/5/10 started 7.22.2 12/5/10 started 7.22.2
- the conditional image of ifthenelse can be any format, a (!=0) is added if - the conditional image of ifthenelse can be any format, a (!=0) is added if

23
TODO
View File

@ -1,26 +1,3 @@
- memleak in exif?
==5775== 392 (192 direct, 200 indirect) bytes in 4 blocks are definitely lost
in loss record 1,677 of 1,878
==5775== at 0x4C25896: calloc (vg_replace_malloc.c:418)
==5775== by 0xB7364AA: exif_entry_new_mem (in /usr/lib64/libexif.so.12.3.1)
==5775== by 0xB73651D: exif_entry_new (in /usr/lib64/libexif.so.12.3.1)
==5775== by 0x9CFE041: ??? (in /usr/lib64/libvips.so.15.14.3)
==5775== by 0x9CFE5C6: ??? (in /usr/lib64/libvips.so.15.14.3)
==5775== by 0x9CFEB6D: im_vips2jpeg (in /usr/lib64/libvips.so.15.14.3)
==5775== by 0x9D25262: ??? (in /usr/lib64/libvips.so.15.14.3)
==5775== by 0x9D20F41: ??? (in /usr/lib64/libvips.so.15.14.3)
==5775== by 0x9D2F2D5: im_slist_map2 (in /usr/lib64/libvips.so.15.14.3)
==5775== by 0x9D210EE: im__trigger_callbacks (in
/usr/lib64/libvips.so.15.14.3)
==5775== by 0x9D246AE: im_generate (in /usr/lib64/libvips.so.15.14.3)
==5775== by 0x9CAE85C: ??? (in /usr/lib64/libvips.so.15.14.3)
==5775== by 0x9A2FACD: shrink_factor (photo-meta-reader-vips.c:232)
==5775== by 0x9A2FBBE: thumbnail2 (photo-meta-reader-vips.c:261)
==5775== by 0x9A2FD15: thumbnail (photo-meta-reader-vips.c:296)
- lab [100,0,0] -> srgb [255, 255, 254]? how odd - lab [100,0,0] -> srgb [255, 255, 254]? how odd

58
libvipsCC/include/vips/vipsc++.h
View File

@ -1,7 +1,7 @@
// headers for package arithmetic // headers for package arithmetic
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage abs() throw( VError ); VImage abs() throw( VError );
VImage acos() throw( VError ); VImage acos() throw( VError );
VImage add( VImage ) throw( VError ); VImage add( VImage ) throw( VError );
@ -48,7 +48,7 @@ VImage tan() throw( VError );
// headers for package boolean // headers for package boolean
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage andimage( VImage ) throw( VError ); VImage andimage( VImage ) throw( VError );
VImage andimage( int ) throw( VError ); VImage andimage( int ) throw( VError );
VImage andimage( std::vector<double> ) throw( VError ); VImage andimage( std::vector<double> ) throw( VError );
@ -65,13 +65,13 @@ VImage shiftright( int ) throw( VError );
// headers for package cimg // headers for package cimg
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage greyc( int, double, double, double, double, double, double, double, double, int, int ) throw( VError ); 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 ); VImage greyc_mask( VImage, int, double, double, double, double, double, double, double, double, int, int ) throw( VError );
// headers for package colour // headers for package colour
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage LCh2Lab() throw( VError ); VImage LCh2Lab() throw( VError );
VImage LCh2UCS() throw( VError ); VImage LCh2UCS() throw( VError );
VImage Lab2LCh() throw( VError ); VImage Lab2LCh() throw( VError );
@ -117,7 +117,7 @@ VImage sRGB2XYZ() throw( VError );
// headers for package conversion // headers for package conversion
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
static VImage gaussnoise( int, int, double, double ) throw( VError ); static VImage gaussnoise( int, int, double, double ) throw( VError );
VImage bandjoin( VImage ) throw( VError ); VImage bandjoin( VImage ) throw( VError );
static VImage black( int, int, int ) throw( VError ); static VImage black( int, int, int ) throw( VError );
@ -167,7 +167,7 @@ VImage zoom( int, int ) throw( VError );
// headers for package convolution // headers for package convolution
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage addgnoise( double ) throw( VError ); VImage addgnoise( double ) throw( VError );
VImage compass( VIMask ) throw( VError ); VImage compass( VIMask ) throw( VError );
VImage contrast_surface( int, int ) throw( VError ); VImage contrast_surface( int, int ) throw( VError );
@ -186,7 +186,10 @@ VImage spcor( VImage ) throw( VError );
// headers for package deprecated // headers for package deprecated
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage flood_copy( int, int, std::vector<double> ) throw( VError );
VImage flood_blob_copy( int, int, std::vector<double> ) throw( VError );
VImage flood_other_copy( VImage, int, int, int ) throw( VError );
VImage clip() throw( VError ); VImage clip() throw( VError );
VImage c2ps() throw( VError ); VImage c2ps() throw( VError );
VImage resize_linear( int, int ) throw( VError ); VImage resize_linear( int, int ) throw( VError );
@ -228,10 +231,12 @@ VImage dilate_raw( VIMask ) throw( VError );
VImage erode_raw( VIMask ) throw( VError ); VImage erode_raw( VIMask ) throw( VError );
VImage similarity_area( 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 ); VImage similarity( double, double, double, double ) throw( VError );
void insertplace( VImage, int, int ) throw( VError );
void circle( int, int, int, int ) throw( VError );
// headers for package format // headers for package format
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
static VImage csv2vips( char* ) throw( VError ); static VImage csv2vips( char* ) throw( VError );
static VImage jpeg2vips( char* ) throw( VError ); static VImage jpeg2vips( char* ) throw( VError );
static VImage magick2vips( char* ) throw( VError ); static VImage magick2vips( char* ) throw( VError );
@ -249,7 +254,7 @@ void vips2tiff( char* ) throw( VError );
// headers for package freq_filt // headers for package freq_filt
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
static VImage create_fmask( int, int, int, double, double, double, double, double ) throw( VError ); static VImage create_fmask( int, int, int, double, double, double, double, double ) throw( VError );
VImage disp_ps() throw( VError ); VImage disp_ps() throw( VError );
VImage flt_image_freq( int, double, double, double, double, double ) throw( VError ); VImage flt_image_freq( int, double, double, double, double, double ) throw( VError );
@ -263,7 +268,7 @@ VImage invfftr() throw( VError );
// headers for package histograms_lut // headers for package histograms_lut
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage gammacorrect( double ) throw( VError ); VImage gammacorrect( double ) throw( VError );
VImage heq( int ) throw( VError ); VImage heq( int ) throw( VError );
VImage hist( int ) throw( VError ); VImage hist( int ) throw( VError );
@ -293,17 +298,22 @@ VImage tone_map( VImage ) throw( VError );
// headers for package inplace // headers for package inplace
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
void circle( int, int, int, int ) throw( VError ); void draw_circle( int, int, int, int, std::vector<double> ) throw( VError );
VImage flood_copy( int, int, std::vector<double> ) throw( VError ); void draw_rect( int, int, int, int, int, std::vector<double> ) throw( VError );
VImage flood_blob_copy( int, int, std::vector<double> ) throw( VError ); void draw_line( int, int, int, int, std::vector<double> ) throw( VError );
VImage flood_other_copy( VImage, int, int, int ) throw( VError ); void draw_point( int, int, std::vector<double> ) throw( VError );
void insertplace( VImage, int, int ) throw( VError ); void draw_smudge( int, int, int, int ) throw( VError );
void draw_flood( int, int, std::vector<double> ) throw( VError );
void draw_flood_blob( int, int, std::vector<double> ) throw( VError );
void draw_flood_other( VImage, int, int, int ) throw( VError );
void draw_image( VImage, int, int ) throw( VError );
void draw_mask( VImage, int, int, std::vector<double> ) throw( VError );
VImage line( VImage, VImage, std::vector<int>, std::vector<int>, std::vector<int>, std::vector<int> ) throw( VError ); VImage line( VImage, VImage, std::vector<int>, std::vector<int>, std::vector<int>, std::vector<int> ) throw( VError );
// headers for package iofuncs // headers for package iofuncs
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
static VImage binfile( char*, int, int, int, int ) throw( VError ); static VImage binfile( char*, int, int, int, int ) throw( VError );
VImage cache( int, int, int ) throw( VError ); VImage cache( int, int, int ) throw( VError );
char* getext() throw( VError ); char* getext() throw( VError );
@ -316,11 +326,11 @@ void printdesc() throw( VError );
// headers for package mask // headers for package mask
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// headers for package morphology // headers for package morphology
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
double cntlines( int ) throw( VError ); double cntlines( int ) throw( VError );
VImage dilate( VIMask ) throw( VError ); VImage dilate( VIMask ) throw( VError );
VImage rank( int, int, int ) throw( VError ); VImage rank( int, int, int ) throw( VError );
@ -333,7 +343,7 @@ VImage profile( int ) throw( VError );
// headers for package mosaicing // headers for package mosaicing
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage align_bands() throw( VError ); VImage align_bands() throw( VError );
double correl( VImage, int, int, int, int, int, int, int&, int& ) 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 ); int _find_lroverlap( VImage, int, int, int, int, int, int, int, int&, double&, double&, double&, double& ) throw( VError );
@ -355,7 +365,7 @@ VImage tbmosaic1( VImage, int, int, int, int, int, int, int, int, int, int, int,
// headers for package other // headers for package other
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage benchmark() throw( VError ); VImage benchmark() throw( VError );
double benchmark2() throw( VError ); double benchmark2() throw( VError );
VImage benchmarkn( int ) throw( VError ); VImage benchmarkn( int ) throw( VError );
@ -369,7 +379,7 @@ static VImage zone( int ) throw( VError );
// headers for package relational // headers for package relational
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage blend( VImage, VImage ) throw( VError ); VImage blend( VImage, VImage ) throw( VError );
VImage equal( VImage ) throw( VError ); VImage equal( VImage ) throw( VError );
VImage equal( std::vector<double> ) throw( VError ); VImage equal( std::vector<double> ) throw( VError );
@ -393,14 +403,14 @@ VImage notequal( double ) throw( VError );
// headers for package resample // headers for package resample
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
VImage rightshift_size( int, int, int ) throw( VError ); VImage rightshift_size( int, int, int ) throw( VError );
VImage shrink( double, double ) throw( VError ); VImage shrink( double, double ) throw( VError );
VImage stretch3( double, double ) throw( VError ); VImage stretch3( double, double ) throw( VError );
// headers for package video // headers for package video
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
static VImage video_test( int, int ) throw( VError ); static VImage video_test( int, int ) throw( VError );
static VImage video_v4l1( char*, int, int, int, int, int, int ) throw( VError ); static VImage video_v4l1( char*, int, int, int, int, int, int ) throw( VError );

315
libvipsCC/vipsc++.cc
View File

@ -1,7 +1,7 @@
// bodies for package arithmetic // bodies for package arithmetic
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_abs: absolute value // im_abs: absolute value
VImage VImage::abs() throw( VError ) VImage VImage::abs() throw( VError )
{ {
@ -741,7 +741,7 @@ VImage VImage::tan() throw( VError )
// bodies for package boolean // bodies for package boolean
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_andimage: bitwise and of two images // im_andimage: bitwise and of two images
VImage VImage::andimage( VImage in2 ) throw( VError ) VImage VImage::andimage( VImage in2 ) throw( VError )
{ {
@ -984,7 +984,7 @@ VImage VImage::shiftright( int c ) throw( VError )
// bodies for package cimg // bodies for package cimg
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_greyc: noise-removing filter // im_greyc: noise-removing filter
VImage VImage::greyc( int iterations, double amplitude, double sharpness, double anisotropy, double alpha, double sigma, double dl, double da, double gauss_prec, int interpolation, int fast_approx ) throw( VError ) VImage VImage::greyc( int iterations, double amplitude, double sharpness, double anisotropy, double alpha, double sigma, double dl, double da, double gauss_prec, int interpolation, int fast_approx ) throw( VError )
{ {
@ -1044,7 +1044,7 @@ VImage VImage::greyc_mask( VImage mask, int iterations, double amplitude, double
// bodies for package colour // bodies for package colour
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_LCh2Lab: convert LCh to Lab // im_LCh2Lab: convert LCh to Lab
VImage VImage::LCh2Lab() throw( VError ) VImage VImage::LCh2Lab() throw( VError )
{ {
@ -1760,7 +1760,7 @@ VImage VImage::sRGB2XYZ() throw( VError )
// bodies for package conversion // bodies for package conversion
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_gaussnoise: generate image of gaussian noise with specified statistics // im_gaussnoise: generate image of gaussian noise with specified statistics
VImage VImage::gaussnoise( int xsize, int ysize, double mean, double sigma ) throw( VError ) VImage VImage::gaussnoise( int xsize, int ysize, double mean, double sigma ) throw( VError )
{ {
@ -2574,7 +2574,7 @@ VImage VImage::zoom( int xfac, int yfac ) throw( VError )
// bodies for package convolution // bodies for package convolution
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_addgnoise: add gaussian noise with mean 0 and std. dev. sigma // im_addgnoise: add gaussian noise with mean 0 and std. dev. sigma
VImage VImage::addgnoise( double sigma ) throw( VError ) VImage VImage::addgnoise( double sigma ) throw( VError )
{ {
@ -2840,7 +2840,68 @@ VImage VImage::spcor( VImage in2 ) throw( VError )
// bodies for package deprecated // bodies for package deprecated
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_flood_copy: flood with ink from start_x, start_y while pixel == start pixel
VImage VImage::flood_copy( int start_x, int start_y, std::vector<double> ink ) throw( VError )
{
VImage in = *this;
VImage out;
Vargv _vec( "im_flood_copy" );
_vec.data(0) = in.image();
_vec.data(1) = out.image();
*((int*) _vec.data(2)) = start_x;
*((int*) _vec.data(3)) = start_y;
((im_doublevec_object*) _vec.data(4))->n = ink.size();
((im_doublevec_object*) _vec.data(4))->vec = new double[ink.size()];
for( unsigned int i = 0; i < ink.size(); i++ )
((im_doublevec_object*) _vec.data(4))->vec[i] = ink[i];
_vec.call();
return( out );
}
// im_flood_blob_copy: flood with ink from start_x, start_y while pixel == start pixel
VImage VImage::flood_blob_copy( int start_x, int start_y, std::vector<double> ink ) throw( VError )
{
VImage in = *this;
VImage out;
Vargv _vec( "im_flood_blob_copy" );
_vec.data(0) = in.image();
_vec.data(1) = out.image();
*((int*) _vec.data(2)) = start_x;
*((int*) _vec.data(3)) = start_y;
((im_doublevec_object*) _vec.data(4))->n = ink.size();
((im_doublevec_object*) _vec.data(4))->vec = new double[ink.size()];
for( unsigned int i = 0; i < ink.size(); i++ )
((im_doublevec_object*) _vec.data(4))->vec[i] = ink[i];
_vec.call();
return( out );
}
// im_flood_other_copy: flood mark with serial from start_x, start_y while pixel == start pixel
VImage VImage::flood_other_copy( VImage mark, int start_x, int start_y, int serial ) throw( VError )
{
VImage test = *this;
VImage out;
Vargv _vec( "im_flood_other_copy" );
_vec.data(0) = test.image();
_vec.data(1) = mark.image();
_vec.data(2) = out.image();
*((int*) _vec.data(3)) = start_x;
*((int*) _vec.data(4)) = start_y;
*((int*) _vec.data(5)) = serial;
_vec.call();
return( out );
}
// im_clip: convert to unsigned 8-bit integer // im_clip: convert to unsigned 8-bit integer
VImage VImage::clip() throw( VError ) VImage VImage::clip() throw( VError )
{ {
@ -3568,10 +3629,37 @@ VImage VImage::similarity( double a, double b, double dx, double dy ) throw( VEr
return( out ); return( out );
} }
// im_insertplace: draw image sub inside image main at position (x,y)
void VImage::insertplace( VImage sub, int x, int y ) throw( VError )
{
VImage main = *this;
Vargv _vec( "im_insertplace" );
_vec.data(0) = main.image();
_vec.data(1) = sub.image();
*((int*) _vec.data(2)) = x;
*((int*) _vec.data(3)) = y;
_vec.call();
}
// im_circle: plot circle on image
void VImage::circle( int cx, int cy, int radius, int intensity ) throw( VError )
{
VImage image = *this;
Vargv _vec( "im_circle" );
_vec.data(0) = image.image();
*((int*) _vec.data(1)) = cx;
*((int*) _vec.data(2)) = cy;
*((int*) _vec.data(3)) = radius;
*((int*) _vec.data(4)) = intensity;
_vec.call();
}
// bodies for package format // bodies for package format
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_csv2vips: read a file in csv format // im_csv2vips: read a file in csv format
VImage VImage::csv2vips( char* filename ) throw( VError ) VImage VImage::csv2vips( char* filename ) throw( VError )
{ {
@ -3753,7 +3841,7 @@ void VImage::vips2tiff( char* out ) throw( VError )
// bodies for package freq_filt // bodies for package freq_filt
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_create_fmask: create frequency domain filter mask // im_create_fmask: create frequency domain filter mask
VImage VImage::create_fmask( int width, int height, int type, double p1, double p2, double p3, double p4, double p5 ) throw( VError ) VImage VImage::create_fmask( int width, int height, int type, double p1, double p2, double p3, double p4, double p5 ) throw( VError )
{ {
@ -3921,7 +4009,7 @@ VImage VImage::invfftr() throw( VError )
// bodies for package histograms_lut // bodies for package histograms_lut
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_gammacorrect: gamma-correct image // im_gammacorrect: gamma-correct image
VImage VImage::gammacorrect( double exponent ) throw( VError ) VImage VImage::gammacorrect( double exponent ) throw( VError )
{ {
@ -4368,95 +4456,168 @@ VImage VImage::tone_map( VImage lut ) throw( VError )
// bodies for package inplace // bodies for package inplace
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_circle: plot circle on image // im_draw_circle: draw circle on image
void VImage::circle( int cx, int cy, int radius, int intensity ) throw( VError ) void VImage::draw_circle( int cx, int cy, int radius, int fill, std::vector<double> ink ) throw( VError )
{ {
VImage image = *this; VImage image = *this;
Vargv _vec( "im_circle" ); Vargv _vec( "im_draw_circle" );
_vec.data(0) = image.image(); _vec.data(0) = image.image();
*((int*) _vec.data(1)) = cx; *((int*) _vec.data(1)) = cx;
*((int*) _vec.data(2)) = cy; *((int*) _vec.data(2)) = cy;
*((int*) _vec.data(3)) = radius; *((int*) _vec.data(3)) = radius;
*((int*) _vec.data(4)) = intensity; *((int*) _vec.data(4)) = fill;
_vec.call(); ((im_doublevec_object*) _vec.data(5))->n = ink.size();
} ((im_doublevec_object*) _vec.data(5))->vec = new double[ink.size()];
// im_flood_copy: flood with ink from start_x, start_y while pixel == start pixel
VImage VImage::flood_copy( int start_x, int start_y, std::vector<double> ink ) throw( VError )
{
VImage in = *this;
VImage out;
Vargv _vec( "im_flood_copy" );
_vec.data(0) = in.image();
_vec.data(1) = out.image();
*((int*) _vec.data(2)) = start_x;
*((int*) _vec.data(3)) = start_y;
((im_doublevec_object*) _vec.data(4))->n = ink.size();
((im_doublevec_object*) _vec.data(4))->vec = new double[ink.size()];
for( unsigned int i = 0; i < ink.size(); i++ ) for( unsigned int i = 0; i < ink.size(); i++ )
((im_doublevec_object*) _vec.data(4))->vec[i] = ink[i]; ((im_doublevec_object*) _vec.data(5))->vec[i] = ink[i];
_vec.call(); _vec.call();
return( out );
} }
// im_flood_blob_copy: flood with ink from start_x, start_y while pixel == start pixel // im_draw_rect: draw rect on image
VImage VImage::flood_blob_copy( int start_x, int start_y, std::vector<double> ink ) throw( VError ) void VImage::draw_rect( int left, int top, int width, int height, int fill, std::vector<double> ink ) throw( VError )
{ {
VImage in = *this; VImage image = *this;
VImage out; Vargv _vec( "im_draw_rect" );
Vargv _vec( "im_flood_blob_copy" ); _vec.data(0) = image.image();
*((int*) _vec.data(1)) = left;
_vec.data(0) = in.image(); *((int*) _vec.data(2)) = top;
_vec.data(1) = out.image(); *((int*) _vec.data(3)) = width;
*((int*) _vec.data(2)) = start_x; *((int*) _vec.data(4)) = height;
*((int*) _vec.data(3)) = start_y; *((int*) _vec.data(5)) = fill;
((im_doublevec_object*) _vec.data(4))->n = ink.size(); ((im_doublevec_object*) _vec.data(6))->n = ink.size();
((im_doublevec_object*) _vec.data(4))->vec = new double[ink.size()]; ((im_doublevec_object*) _vec.data(6))->vec = new double[ink.size()];
for( unsigned int i = 0; i < ink.size(); i++ ) for( unsigned int i = 0; i < ink.size(); i++ )
((im_doublevec_object*) _vec.data(4))->vec[i] = ink[i]; ((im_doublevec_object*) _vec.data(6))->vec[i] = ink[i];
_vec.call(); _vec.call();
return( out );
} }
// im_flood_other_copy: flood mark with serial from start_x, start_y while pixel == start pixel // im_draw_line: draw line on image
VImage VImage::flood_other_copy( VImage mark, int start_x, int start_y, int serial ) throw( VError ) void VImage::draw_line( int x1, int y1, int x2, int y2, std::vector<double> ink ) throw( VError )
{ {
VImage test = *this; VImage image = *this;
VImage out; Vargv _vec( "im_draw_line" );
Vargv _vec( "im_flood_other_copy" ); _vec.data(0) = image.image();
*((int*) _vec.data(1)) = x1;
_vec.data(0) = test.image(); *((int*) _vec.data(2)) = y1;
_vec.data(1) = mark.image(); *((int*) _vec.data(3)) = x2;
_vec.data(2) = out.image(); *((int*) _vec.data(4)) = y2;
*((int*) _vec.data(3)) = start_x; ((im_doublevec_object*) _vec.data(5))->n = ink.size();
*((int*) _vec.data(4)) = start_y; ((im_doublevec_object*) _vec.data(5))->vec = new double[ink.size()];
*((int*) _vec.data(5)) = serial; for( unsigned int i = 0; i < ink.size(); i++ )
((im_doublevec_object*) _vec.data(5))->vec[i] = ink[i];
_vec.call(); _vec.call();
return( out );
} }
// im_insertplace: draw image sub inside image main at position (x,y) // im_draw_point: draw point on image
void VImage::insertplace( VImage sub, int x, int y ) throw( VError ) void VImage::draw_point( int x, int y, std::vector<double> ink ) throw( VError )
{ {
VImage main = *this; VImage image = *this;
Vargv _vec( "im_insertplace" ); Vargv _vec( "im_draw_point" );
_vec.data(0) = main.image(); _vec.data(0) = image.image();
*((int*) _vec.data(1)) = x;
*((int*) _vec.data(2)) = y;
((im_doublevec_object*) _vec.data(3))->n = ink.size();
((im_doublevec_object*) _vec.data(3))->vec = new double[ink.size()];
for( unsigned int i = 0; i < ink.size(); i++ )
((im_doublevec_object*) _vec.data(3))->vec[i] = ink[i];
_vec.call();
}
// im_draw_smudge: smudge part of an image
void VImage::draw_smudge( int left, int top, int width, int height ) throw( VError )
{
VImage image = *this;
Vargv _vec( "im_draw_smudge" );
_vec.data(0) = image.image();
*((int*) _vec.data(1)) = left;
*((int*) _vec.data(2)) = top;
*((int*) _vec.data(3)) = width;
*((int*) _vec.data(4)) = height;
_vec.call();
}
// im_draw_flood: flood with ink from x, y while pixel != ink
void VImage::draw_flood( int x, int y, std::vector<double> ink ) throw( VError )
{
VImage image = *this;
Vargv _vec( "im_draw_flood" );
_vec.data(0) = image.image();
*((int*) _vec.data(1)) = x;
*((int*) _vec.data(2)) = y;
((im_doublevec_object*) _vec.data(3))->n = ink.size();
((im_doublevec_object*) _vec.data(3))->vec = new double[ink.size()];
for( unsigned int i = 0; i < ink.size(); i++ )
((im_doublevec_object*) _vec.data(3))->vec[i] = ink[i];
_vec.call();
}
// im_draw_flood_blob: flood with ink from x, y while pixel == start
void VImage::draw_flood_blob( int x, int y, std::vector<double> ink ) throw( VError )
{
VImage image = *this;
Vargv _vec( "im_draw_flood_blob" );
_vec.data(0) = image.image();
*((int*) _vec.data(1)) = x;
*((int*) _vec.data(2)) = y;
((im_doublevec_object*) _vec.data(3))->n = ink.size();
((im_doublevec_object*) _vec.data(3))->vec = new double[ink.size()];
for( unsigned int i = 0; i < ink.size(); i++ )
((im_doublevec_object*) _vec.data(3))->vec[i] = ink[i];
_vec.call();
}
// im_draw_flood_other: flood image with serial from x, y while pixel == start
void VImage::draw_flood_other( VImage test, int x, int y, int serial ) throw( VError )
{
VImage image = *this;
Vargv _vec( "im_draw_flood_other" );
_vec.data(0) = image.image();
_vec.data(1) = test.image();
*((int*) _vec.data(2)) = x;
*((int*) _vec.data(3)) = y;
*((int*) _vec.data(4)) = serial;
_vec.call();
}
// im_draw_image: draw image sub inside image main at position (x,y)
void VImage::draw_image( VImage sub, int x, int y ) throw( VError )
{
VImage image = *this;
Vargv _vec( "im_draw_image" );
_vec.data(0) = image.image();
_vec.data(1) = sub.image(); _vec.data(1) = sub.image();
*((int*) _vec.data(2)) = x; *((int*) _vec.data(2)) = x;
*((int*) _vec.data(3)) = y; *((int*) _vec.data(3)) = y;
_vec.call(); _vec.call();
} }
// im_draw_mask: draw mask sub inside image main at position (x,y)
void VImage::draw_mask( VImage mask, int x, int y, std::vector<double> ink ) throw( VError )
{
VImage image = *this;
Vargv _vec( "im_draw_mask" );
_vec.data(0) = image.image();
_vec.data(1) = mask.image();
*((int*) _vec.data(2)) = x;
*((int*) _vec.data(3)) = y;
((im_doublevec_object*) _vec.data(4))->n = ink.size();
((im_doublevec_object*) _vec.data(4))->vec = new double[ink.size()];
for( unsigned int i = 0; i < ink.size(); i++ )
((im_doublevec_object*) _vec.data(4))->vec[i] = ink[i];
_vec.call();
}
// im_lineset: draw line between points (x1,y1) and (x2,y2) // im_lineset: draw line between points (x1,y1) and (x2,y2)
VImage VImage::line( VImage mask, VImage ink, std::vector<int> x1, std::vector<int> y1, std::vector<int> x2, std::vector<int> y2 ) throw( VError ) VImage VImage::line( VImage mask, VImage ink, std::vector<int> x1, std::vector<int> y1, std::vector<int> x2, std::vector<int> y2 ) throw( VError )
{ {
@ -4493,7 +4654,7 @@ VImage VImage::line( VImage mask, VImage ink, std::vector<int> x1, std::vector<i
// bodies for package iofuncs // bodies for package iofuncs
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_binfile: open a headerless binary file // im_binfile: open a headerless binary file
VImage VImage::binfile( char* filename, int width, int height, int bands, int offset ) throw( VError ) VImage VImage::binfile( char* filename, int width, int height, int bands, int offset ) throw( VError )
{ {
@ -4637,11 +4798,11 @@ void VImage::printdesc() throw( VError )
// bodies for package mask // bodies for package mask
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// bodies for package morphology // bodies for package morphology
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_cntlines: count horizontal or vertical lines // im_cntlines: count horizontal or vertical lines
double VImage::cntlines( int direction ) throw( VError ) double VImage::cntlines( int direction ) throw( VError )
{ {
@ -4802,7 +4963,7 @@ VImage VImage::profile( int direction ) throw( VError )
// bodies for package mosaicing // bodies for package mosaicing
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_align_bands: align the bands of an image // im_align_bands: align the bands of an image
VImage VImage::align_bands() throw( VError ) VImage VImage::align_bands() throw( VError )
{ {
@ -5235,7 +5396,7 @@ VImage VImage::tbmosaic1( VImage sec, int bandno, int xr1, int yr1, int xs1, int
// bodies for package other // bodies for package other
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_benchmark: do something complicated for testing // im_benchmark: do something complicated for testing
VImage VImage::benchmark() throw( VError ) VImage VImage::benchmark() throw( VError )
{ {
@ -5392,7 +5553,7 @@ VImage VImage::zone( int size ) throw( VError )
// bodies for package relational // bodies for package relational
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_blend: use cond image to blend between images in1 and in2 // im_blend: use cond image to blend between images in1 and in2
VImage VImage::blend( VImage in1, VImage in2 ) throw( VError ) VImage VImage::blend( VImage in1, VImage in2 ) throw( VError )
{ {
@ -5766,7 +5927,7 @@ VImage VImage::notequal( double c ) throw( VError )
// bodies for package resample // bodies for package resample
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_rightshift_size: decrease size by a power-of-two factor // im_rightshift_size: decrease size by a power-of-two factor
VImage VImage::rightshift_size( int xshift, int yshift, int band_fmt ) throw( VError ) VImage VImage::rightshift_size( int xshift, int yshift, int band_fmt ) throw( VError )
{ {
@ -5825,7 +5986,7 @@ VImage VImage::stretch3( double xdisp, double ydisp ) throw( VError )
// bodies for package video // bodies for package video
// this file automatically generated from // this file automatically generated from
// VIPS library 7.22.1-Tue Jun 22 10:26:51 BST 2010 // VIPS library 7.23.0-Thu Nov 18 12:39:29 GMT 2010
// im_video_test: test video grabber // im_video_test: test video grabber
VImage VImage::video_test( int brightness, int error ) throw( VError ) VImage VImage::video_test( int brightness, int error ) throw( VError )
{ {