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

more C++ hacking

Browse Source
This commit is contained in:
John Cupitt 2014-10-20 14:54:03 +01:00
parent 022150ceea
commit f2898a8e3b
7 changed files with 249 additions and 7109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TODO
View File

@ -1,3 +1,9 @@
- see
http://www.parashift.com/c++-faq/named-parameter-idiom.html
good idea? seems clumsy
- use vips_autorot() in jpegload and vipsthumbnail - use vips_autorot() in jpegload and vipsthumbnail
- fix up aconv - fix up aconv

581
cplusplus/VImage.cc
View File

@ -52,11 +52,12 @@
VIPS_NAMESPACE_START VIPS_NAMESPACE_START
/* Useful to have these as C++ functions. /* Useful to have these as namespaced C++ functions.
*/ */
bool init( const char *argv0 ) void init( const char *argv0 )
{ {
return( vips__init( argv0 ) == 0 ); if( vips_init( argv0 ) )
throw VError();
} }
void shutdown() void shutdown()
@ -69,484 +70,122 @@ void thread_shutdown()
vips_thread_shutdown(); vips_thread_shutdown();
} }
void VImage::refblock::debug_print() // see vips_image_new_from_file()
{ VImage::VImage( const char *name, ... )
std::list<refblock *>::iterator i; __attribute__((sentinel)) throw( VError )
printf( "refblock %p:\n", this );
printf( " im = %p", im );
if( im && im->filename )
printf( " (im->filename = \"%s\")", im->filename );
printf( "\n" );
printf( " close_on_delete = %d\n", close_on_delete );
printf( " nrefs (refs to us) = %d\n", nrefs );
printf( " orefs (refs we make) = refblocks " );
for( i = orefs.begin(); i != orefs.end(); i++ )
printf( "%p ", *i );
printf( "\n" );
}
// dump all refblocks for debugging
void VImage::print_all()
{
#ifdef DEBUG
std::list<VImage::refblock *>::iterator i;
printf( "*** VImage::refblock::print_all() start\n" );
for( i = all_refblock.begin(); i != all_refblock.end(); i++ )
(*i)->debug_print();
printf( "*** VImage::refblock::print_all() end\n" );
#endif /*DEBUG*/
}
// easy call from C version
void im__ccp_print_all()
{
VImage::print_all();
}
// constructor
VImage::refblock::refblock()
{
im = 0;
close_on_delete = 1;
nrefs = 1;
#ifdef DEBUG
all_refblock.push_front( this );
#endif /*DEBUG*/
}
// Add a ref - this (output image) depends upon VipsImage in
void VImage::refblock::addref( refblock *in ) throw( VError )
{
if( this == in )
verror( "sanity failure" );
in->nrefs++;
orefs.push_front( in );
}
VImage::refblock::~refblock() throw( VError )
{
#ifdef DEBUG
printf( "VImage::refblock::removeref(): death!\n" );
debug_print();
#endif /*DEBUG*/
std::list<refblock *>::iterator i;
if( close_on_delete && im ) {
if( im_close( im ) )
verror();
im = 0;
}
// remove any refs we have ... may trigger other destructs in turn
for( i = orefs.begin(); i != orefs.end(); i++ )
(*i)->removeref();
#ifdef DEBUG
all_refblock.remove( this );
#endif /*DEBUG*/
}
// Remove a ref
void VImage::refblock::removeref() throw( VError )
{
nrefs--;
if( nrefs < 0 )
verror( "too many closes!" );
if( nrefs == 0 )
delete this;
}
// Init with name ... mode defaults to "rd"
VImage::VImage( const char *name, const char *mode ) throw( VError )
{
_ref = new refblock;
if( !(_ref->im = im_open( name, mode )) )
verror();
_ref->close_on_delete = 1;
#ifdef DEBUG
printf( "VImage::VImage( \"%s\", \"%s\" )\n", name, mode );
_ref->debug_print();
#endif /*DEBUG*/
}
// Build a VImage from an VipsImage structure
VImage::VImage( _VipsImage *in )
{
_ref = new refblock;
_ref->im = in;
_ref->close_on_delete = 0;
#ifdef DEBUG
printf( "VImage::VImage( VipsImage* %p )\n", in );
_ref->debug_print();
#endif /*DEBUG*/
}
// Build from memory buffer
VImage::VImage( void *buffer, int width, int height,
int bands, TBandFmt format ) throw( VError )
{
_ref = new refblock;
if( !(_ref->im = im_image( buffer, width, height,
bands, VipsBandFmt( format ) )) )
verror();
_ref->close_on_delete = 1;
#ifdef DEBUG
printf( "VImage::VImage( void* %p, %d, %d )\n",
buffer, width, height );
_ref->debug_print();
#endif /*DEBUG*/
}
// Empty init ... means open intermediate
VImage::VImage() throw( VError )
{
static int id = 0;
char filename[256];
_ref = new refblock;
/* This is not 100% safe if VIPS threading is not implemented on this
* platform ... but it doesn't really matter.
*/
g_mutex_lock( im__global_lock );
im_snprintf( filename, 256, "intermediate image #%d", id++ );
g_mutex_unlock( im__global_lock );
if( !(_ref->im = im_open( filename, "p" )) )
verror();
_ref->close_on_delete = 1;
#ifdef DEBUG
printf( "VImage::VImage()\n" );
_ref->debug_print();
#endif /*DEBUG*/
}
// Copy constructor
VImage::VImage( const VImage &a )
{
_ref = a._ref;
_ref->nrefs++;
}
// Assignment
VImage &VImage::operator=( const VImage &a ) throw( VError )
{
_ref->removeref();
_ref = a._ref;
_ref->nrefs++;
return( *this );
}
// Extract underlying data pointer
void *VImage::data() const throw( VError )
{
if( im_incheck( _ref->im ) )
verror();
return( (void *) _ref->im->data );
}
void VImage::debug_print()
{
im_printdesc( image() );
}
// Like jpeg2vips, but convert to a disc file rather than to memory
// We can handle huge files without running out of RAM
VImage VImage::convert2disc( const char* convert,
const char* in, const char* disc ) throw( VError )
{
VImage out( disc, "w" );
Vargv _vec( convert );
_vec.data(0) = (im_object) in;
_vec.data(1) = out.image();
_vec.call();
return( out );
}
// Write this to a VImage
VImage VImage::write( VImage out ) throw( VError )
{
if( im_copy( _ref->im, out._ref->im ) )
verror();
out._ref->addref( _ref );
return( out );
}
VImage VImage::write( const char *name ) throw( VError )
{
VImage out( name, "w" );
if( im_copy( _ref->im, out._ref->im ) )
verror();
out._ref->addref( _ref );
return( out );
}
VImage VImage::write() throw( VError )
{
VImage out( "VImage:w1", "t" );
if( im_copy( _ref->im, out._ref->im ) )
verror();
out._ref->addref( _ref );
return( out );
}
// Projection functions to get header fields
int VImage::Xsize() { return( _ref->im->Xsize ); }
int VImage::Ysize() { return( _ref->im->Ysize ); }
int VImage::Bands() { return( _ref->im->Bands ); }
VImage::TBandFmt VImage::BandFmt()
{ return( (TBandFmt) _ref->im->BandFmt ); }
VImage::TCoding VImage::Coding()
{ return( (TCoding) _ref->im->Coding ); }
VImage::TType VImage::Type() { return( (TType) _ref->im->Type ); }
float VImage::Xres() { return( _ref->im->Xres ); }
float VImage::Yres() { return( _ref->im->Yres ); }
int VImage::Length() { return( _ref->im->Length ); }
VImage::TCompression VImage::Compression()
{ return( (TCompression) _ref->im->Compression ); }
short VImage::Level() { return( _ref->im->Level ); }
int VImage::Xoffset() { return( _ref->im->Xoffset ); }
int VImage::Yoffset() { return( _ref->im->Yoffset ); }
// Derived fields
const char *VImage::filename() { return( _ref->im->filename ); }
const char *VImage::Hist() { return( im_history_get( _ref->im ) ); }
VImage VImage::hough_circle( int scale, int min_radius, int max_radius )
throw( VError )
{
VImage in = *this;
VipsImage *x;
VImage out;
if( vips_hough_circle( in.image(), &x,
"scale", scale,
"min_radius", min_radius,
"max_radius", max_radius,
NULL ) )
verror();
if( vips_image_write( x, out.image() ) ) {
g_object_unref( x );
verror();
}
g_object_unref( x );
return( out );
}
// metadata
// base functionality
void VImage::meta_set( const char *field, GValue *value ) throw( VError )
{
if( im_meta_set( _ref->im, field, value ) )
verror();
}
gboolean VImage::meta_remove( const char *field )
{
return( im_meta_remove( _ref->im, field ) );
}
void VImage::meta_get( const char *field, GValue *value_copy ) throw( VError )
{
if( im_meta_get( _ref->im, field, value_copy ) )
verror();
}
GType VImage::meta_get_typeof( const char *field )
{
return( im_meta_get_typeof( _ref->im, field ) );
}
// convenience functions
int VImage::meta_get_int( const char *field )
throw( VError )
{ {
char filename[VIPS_PATH_MAX];
char option_string[VIPS_PATH_MAX];
const char *operation_name;
va_list ap;
int result; int result;
if( im_meta_get_int( _ref->im, field, &result ) ) vips_check_init();
verror();
return( result ); vips__filename_split8( name, filename, option_string );
if( !(operation_name = vips_foreign_find_load( filename )) )
throw VError();
va_start( ap, name );
result = vips_call_split_option_string( operation_name,
option_string, ap, filename, &im );
va_end( ap );
if( result )
throw VError();
} }
double VImage::meta_get_double( const char *field ) // see vips_image_new_from_buffer()
throw( VError ) VImage::VImage( void *buffer, size_t length, const char *option_string, ... )
{ {
double result; const char *operation_name;
VipsBlob *blob;
va_list ap;
int result;
if( im_meta_get_double( _ref->im, field, &result ) ) vips_check_init();
verror();
return( result ); if( !(operation_name =
} vips_foreign_find_load_buffer( buffer, length )) )
throw VError();
const char *VImage::meta_get_string( const char *field ) /* We don't take a copy of the data or free it.
throw( VError )
{
const char *result;
if( im_meta_get_string( _ref->im, field, &result ) )
verror();
return( result );
}
void *VImage::meta_get_area( const char *field ) throw( VError )
{
void *result;
if( im_meta_get_area( _ref->im, field, &result ) )
verror();
return( result );
}
void *VImage::meta_get_blob( const char *field, size_t *length ) throw( VError )
{
void *result;
if( im_meta_get_blob( _ref->im, field, &result, length ) )
verror();
return( result );
}
void VImage::meta_set( const char *field, int value )
throw( VError )
{
if( im_meta_set_int( _ref->im, field, value ) )
verror();
}
void VImage::meta_set( const char *field, double value )
throw( VError )
{
if( im_meta_set_double( _ref->im, field, value ) )
verror();
}
void VImage::meta_set( const char *field, const char *value )
throw( VError )
{
if( im_meta_set_string( _ref->im, field, value ) )
verror();
}
void VImage::meta_set( const char *field,
VCallback free_fn, void *value )
throw( VError )
{
if( im_meta_set_area( _ref->im, field, free_fn, value ) )
verror();
}
void VImage::meta_set( const char *field,
VCallback free_fn, void *value, size_t length )
throw( VError )
{
if( im_meta_set_blob( _ref->im, field, free_fn, value, length ) )
verror();
}
// Set header fields and setbuf() in one go.
void VImage::initdesc( int x, int y, int b,
TBandFmt f, TCoding c, TType t, float xr, float yr, int xo, int yo )
throw( VError )
{
im_initdesc( _ref->im, x, y, b, 0,
VipsBandFmt( f ), VipsCoding( c ), VipsType( t ),
xr, yr, xo, yo );
if( im_setupout( _ref->im ) )
verror();
}
// Create a Vargv from a name
Vargv::Vargv( const char *name )
{
im_function *f = im_find_function( (char *) name );
if( !f )
verror();
fn = (im__function *) f;
base = new im_object[f->argc];
if( im_allocate_vargv( f, base ) ) {
delete[] base;
verror();
}
}
// Destroy a Vargv
Vargv::~Vargv()
{
im_function *f = (im_function *) fn;
// free any memory allocated for input vectors
// this is the stuff allocated in each function during _object* build,
// see vipsc++.cc
for( int i = 0; i < f->argc; i++ ) {
im_type_desc *ty = f->argv[i].desc;
if( !(ty->flags & IM_TYPE_OUTPUT) ) {
if( strcmp( ty->type, IM_TYPE_IMAGEVEC ) == 0 ||
strcmp( ty->type, IM_TYPE_DOUBLEVEC ) == 0 ||
strcmp( ty->type, IM_TYPE_INTVEC ) == 0 ) {
// will work for doublevec and intvec too
im_imagevec_object *io =
(im_imagevec_object *) base[i];
if( io->vec ) {
delete[] io->vec;
io->vec = NULL;
}
}
else if( strcmp( ty->type, IM_TYPE_INTERPOLATE ) == 0 )
g_object_unref( base[i] );
}
}
im_free_vargv( f, base );
delete[] base;
}
// Call the function
void
Vargv::call()
{
im_function *f = (im_function *) fn;
if( f->disp( base ) )
verror();
}
/* Insert automatically generated wrappers for VIPS image processing
* functions.
*/ */
#include "vipsc++.cc" blob = vips_blob_new( NULL, buffer, length );
va_start( ap, option_string );
result = vips_call_split_option_string( operation_name,
option_string, ap, blob, &im );
va_end( ap );
vips_area_unref( VIPS_AREA( blob ) );
if( result )
throw VError();
}
// see vips_image_write_to_file()
void VImage::write( const char *name, ... )
throw( VError )
{
char filename[VIPS_PATH_MAX];
char option_string[VIPS_PATH_MAX];
const char *operation_name;
va_list ap;
int result;
vips__filename_split8( name, filename, option_string );
if( !(operation_name = vips_foreign_find_save( filename )) )
throw VError();
va_start( ap, name );
result = vips_call_split_option_string( operation_name, option_string,
ap, image, filename );
va_end( ap );
if( result )
throw VError();
}
// see vips_image_write_to_buffer()
void *VImage::write( const char *suffix, size_t *size, ... )
throw( VError )
{
char filename[VIPS_PATH_MAX];
char option_string[VIPS_PATH_MAX];
const char *operation_name;
va_list ap;
VipsBlob *blob;
int result;
void *buf;
vips__filename_split8( suffix, filename, option_string );
if( !(operation_name = vips_foreign_find_save_buffer( filename )) )
throw VError();
va_start( ap, size );
result = vips_call_split_option_string( operation_name, option_string,
ap, in, &blob );
va_end( ap );
if( result )
throw VError();
g_assert( blob );
buf = VIPS_AREA( blob )->data;
VIPS_AREA( blob )->free_fn = NULL;
if( size )
*size = VIPS_AREA( blob )->length;
vips_area_unref( VIPS_AREA( blob ) );
return( buf );
}
/* Insert automatically generated wrappers for vips operators.
*/
#include "vips-operators.cc"
VIPS_NAMESPACE_END VIPS_NAMESPACE_END

154
cplusplus/include/vips/VImage.h
View File

@ -40,7 +40,7 @@ VIPS_NAMESPACE_START
/* vips_init() and vips_shutdown as namespaced C++ functions. /* vips_init() and vips_shutdown as namespaced C++ functions.
*/ */
bool init( const char *argv0 = "nothing" ); void init( const char *argv0 = "nothing" ) throw( VError );
void thread_shutdown( void ); void thread_shutdown( void );
void shutdown( void ); void shutdown( void );
@ -48,54 +48,146 @@ void shutdown( void );
*/ */
class VImage { class VImage {
protected: protected:
_VipsImage *im; // Underlying vips pointer VipsImage *im = NULL; // Underlying vips pointer
public: public:
// Plain constructors VImage()
VImage( const char *name, const char *mode = "rd" ) throw( VError ); {
VImage( void *data, int width, int height, im = NULL;
int bands, VipsBandFormat format ) throw( VError ); }
VImage( VipsImage *image );
VImage() throw( VError ); // ref the VipsImage ... see new_steal() for one that steals the
// caller's ref
VImage( VipsImage *vips_image )
{
g_assert( !im );
im = vips_image;
g_object_ref( im );
}
// make a VImage, stealing the caller's ref
VImage new_steal( VipsImage *vips_image )
{
VImage image;
g_assert( !image.im );
image.im = vips_image;
}
VImage( const char *filename, const char *mode = "r" )
throw( VError )
{
vips_check_init();
if( !(im = vips_image_new_mode( filename, mode )) )
throw VError();
}
// see vips_image_new_from_file()
VImage( const char *name, ... )
__attribute__((sentinel)) throw( VError );
// see vips_image_new_from_buffer()
VImage( void *buffer, size_t length, const char *option_string, ... )
__attribute__((sentinel)) throw( VError );
// see vips_image_new_from_memory()
VImage( void *data, size_t size, int width, int height,
int bands, VipsBandFormat format ) throw( VError )
{
vips_check_init();
if( !(im = vips_image_new_from_memory( data, size,
width, height, bands, format )) )
throw VError();
}
// also do
// vips_image_new_matrix()
// vips_image_new_matrixv()
// vips_image_new_matrix_from_array()
// vips_image_new_from_file_raw:()
// vips_image_new_from_file_RW()
// vips_image_new_memory()
// Copy constructor // Copy constructor
VImage( const VImage &a ); VImage( const VImage &a )
{
g_assert( !im );
im = a.im;
g_object_ref( im );
}
// Assignment - delete old ref // Assignment - delete old ref
VImage &operator=( const VImage &a ) throw( VError ); VImage &operator=( const VImage &a )
{
VIPS_UNREF( im );
im = a.im;
g_object_ref( im );
}
// Destructor // Destructor
~VImage() throw( VError ) { VIPS_UNREF( im ); } ~VImage() throw( VError ) { VIPS_UNREF( im ); }
// Extract underlying VipsImage pointer // Peek at the underlying VipsImage pointer
VipsImage *image() const { return( im ); } VipsImage *image() const { return( im ); }
// Write this to another VImage, to a file, or to a mem buffer // get a pointer to the pixels ... can be very slow! this may render
VImage write( VImage out ) throw( VError ); // the whole image to a memory buffer
VImage write( const char *name ) throw( VError ); void *data()
VImage write() throw( VError ); throw( VError )
{
if( vips_image_wio_input( im ) )
throw VError();
// Debugging ... print header fields return( VIPS_IMAGE_ADDR( im, 0, 0 ) );
void debug_print(); }
// Write this to another VImage, to a file, or to a mem buffer
void write( VImage out )
throw( VError )
{
if( vips_image_write( im, out.im ) )
throw VError();
}
void write( const char *name, ... )
throw( VError );
{
if( vips_image_write_to_file( im, out.im ) )
throw VError();
}
// see vips_image_write_to_buffer()
void *write( const char *suffix, size_t *size, ... )
throw( VError );
// also need
// vips_image_write_to_memory()
// Projection functions to get header fields // Projection functions to get header fields
int width(); int width() { return( im->Xsize ); }
int height(); int height() { return( im->Ysize ); }
int bands(); int bands() { return( im->Bands ); }
VipsBandFormat format(); VipsBandFormat format() { return( im->BandFmt ); }
VipsCoding coding(); VipsCoding coding() { return( im->Coding ); }
VipsInterpretation interpretation(); VipsInterpretation interpretation() { return( im->Type ); }
float xres(); float xres() { return( im->Xres ); }
float yres(); float yres() { return( im->Yres ); }
int xoffset(); int xoffset() { return( im->Xoffset ); }
int yoffset(); int yoffset() { return( im->Yoffset ); }
// Derived fields // Derived fields
const char *filename(); const char *filename() { return( im->filename ); }
const char *hist(); const char *hist() { return( vips_image_get_history( im ) ); }
// metadata // metadata
/*
// base functionality // base functionality
void meta_set( const char *field, GValue *value ) throw( VError ); void meta_set( const char *field, GValue *value ) throw( VError );
void meta_get( const char *field, GValue *value_copy ) throw( VError ); void meta_get( const char *field, GValue *value_copy ) throw( VError );
@ -125,11 +217,14 @@ public:
void initdesc( int, int, int, void initdesc( int, int, int,
VipsBandFormat, VipsCoding, VipsInterpretation, VipsBandFormat, VipsCoding, VipsInterpretation,
float = 1.0, float = 1.0, int = 0, int = 0 ) throw( VError ); float = 1.0, float = 1.0, int = 0, int = 0 ) throw( VError );
*/
/* Insert automatically generated headers. /* Insert automatically generated headers.
*/ */
#include "vips-operators.h" #include "vips-operators.h"
/*
// And some in-line operator equivalences done by hand // And some in-line operator equivalences done by hand
friend VImage operator+( VImage a, VImage b ) throw( VError ) friend VImage operator+( VImage a, VImage b ) throw( VError )
{ return( a.add( b ) ); } { return( a.add( b ) ); }
@ -234,6 +329,7 @@ public:
friend VImage operator-( VImage a ) throw( VError ) friend VImage operator-( VImage a ) throw( VError )
{ return( a * -1 ); } { return( a * -1 ); }
*/
}; };

419
cplusplus/include/vips/vips-operators.h
View File

@ -1,418 +1,3 @@
// headers for package arithmetic VImage add( VImage add_in2, ... )
// this file automatically generated from __attribute__((sentinel)) throw( VError );
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
VImage abs() throw( VError );
VImage acos() throw( VError );
VImage add( VImage add_in2 ) throw( VError );
VImage asin() throw( VError );
VImage atan() throw( VError );
double avg() throw( VError );
double point( char* point_interpolate, double point_x, double point_y, int point_band ) throw( VError );
double point_bilinear( double point_bilinear_x, double point_bilinear_y, int point_bilinear_band ) throw( VError );
VImage bandmean() throw( VError );
VImage ceil() throw( VError );
VImage cos() throw( VError );
VImage cross_phase( VImage cross_phase_in2 ) throw( VError );
double deviate() throw( VError );
VImage divide( VImage divide_in2 ) throw( VError );
VImage exp10() throw( VError );
VImage expn( double expn_x ) throw( VError );
VImage expn( std::vector<double> expn_v ) throw( VError );
VImage exp() throw( VError );
VImage floor() throw( VError );
VImage invert() throw( VError );
VImage lin( double lin_a, double lin_b ) throw( VError );
static VImage linreg( std::vector<VImage> linreg_ins, std::vector<double> linreg_xs ) throw( VError );
VImage lin( std::vector<double> lin_a, std::vector<double> lin_b ) throw( VError );
VImage log10() throw( VError );
VImage log() throw( VError );
double max() throw( VError );
std::complex<double> maxpos() throw( VError );
double maxpos_avg( double& maxpos_avg_y, double& maxpos_avg_out ) throw( VError );
VDMask measure( int measure_x, int measure_y, int measure_w, int measure_h, int measure_h_patches, int measure_v_patches ) throw( VError );
double min() throw( VError );
std::complex<double> minpos() throw( VError );
VImage multiply( VImage multiply_in2 ) throw( VError );
VImage pow( double pow_x ) throw( VError );
VImage pow( std::vector<double> pow_v ) throw( VError );
VImage recomb( VDMask recomb_matrix ) throw( VError );
VImage remainder( VImage remainder_in2 ) throw( VError );
VImage remainder( double remainder_x ) throw( VError );
VImage remainder( std::vector<double> remainder_x ) throw( VError );
VImage rint() throw( VError );
VImage sign() throw( VError );
VImage sin() throw( VError );
VDMask stats() throw( VError );
VImage subtract( VImage subtract_in2 ) throw( VError );
VImage tan() throw( VError );
// headers for package cimg
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
VImage greyc( int greyc_iterations, double greyc_amplitude, double greyc_sharpness, double greyc_anisotropy, double greyc_alpha, double greyc_sigma, double greyc_dl, double greyc_da, double greyc_gauss_prec, int greyc_interpolation, int greyc_fast_approx ) throw( VError );
VImage greyc_mask( VImage greyc_mask_mask, int greyc_mask_iterations, double greyc_mask_amplitude, double greyc_mask_sharpness, double greyc_mask_anisotropy, double greyc_mask_alpha, double greyc_mask_sigma, double greyc_mask_dl, double greyc_mask_da, double greyc_mask_gauss_prec, int greyc_mask_interpolation, int greyc_mask_fast_approx ) throw( VError );
// headers for package colour
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
VImage LCh2Lab() throw( VError );
VImage LCh2UCS() throw( VError );
VImage Lab2LCh() throw( VError );
VImage Lab2LabQ() throw( VError );
VImage Lab2LabS() throw( VError );
VImage Lab2UCS() throw( VError );
VImage Lab2XYZ() throw( VError );
VImage Lab2XYZ_temp( double Lab2XYZ_temp_X0, double Lab2XYZ_temp_Y0, double Lab2XYZ_temp_Z0 ) throw( VError );
VImage Lab2disp( VDisplay Lab2disp_disp ) throw( VError );
VImage LabQ2LabS() throw( VError );
VImage LabQ2Lab() throw( VError );
VImage LabQ2XYZ() throw( VError );
VImage LabQ2disp( VDisplay LabQ2disp_disp ) throw( VError );
VImage LabS2LabQ() throw( VError );
VImage LabS2Lab() throw( VError );
VImage UCS2LCh() throw( VError );
VImage UCS2Lab() throw( VError );
VImage UCS2XYZ() throw( VError );
VImage XYZ2Lab() throw( VError );
VImage XYZ2Lab_temp( double XYZ2Lab_temp_X0, double XYZ2Lab_temp_Y0, double XYZ2Lab_temp_Z0 ) throw( VError );
VImage XYZ2UCS() throw( VError );
VImage XYZ2Yxy() throw( VError );
VImage XYZ2disp( VDisplay XYZ2disp_disp ) throw( VError );
VImage XYZ2sRGB() throw( VError );
VImage Yxy2XYZ() throw( VError );
VImage dE00_fromLab( VImage dE00_fromLab_in2 ) throw( VError );
VImage dECMC_fromLab( VImage dECMC_fromLab_in2 ) throw( VError );
VImage dECMC_fromdisp( VImage dECMC_fromdisp_in2, VDisplay dECMC_fromdisp_disp ) throw( VError );
VImage dE_fromLab( VImage dE_fromLab_in2 ) throw( VError );
VImage dE_fromXYZ( VImage dE_fromXYZ_in2 ) throw( VError );
VImage dE_fromdisp( VImage dE_fromdisp_in2, VDisplay dE_fromdisp_disp ) throw( VError );
VImage disp2Lab( VDisplay disp2Lab_disp ) throw( VError );
VImage disp2XYZ( VDisplay disp2XYZ_disp ) throw( VError );
VImage float2rad() throw( VError );
VImage icc_ac2rc( char* icc_ac2rc_profile ) throw( VError );
VImage icc_export_depth( int icc_export_depth_depth, char* icc_export_depth_output_profile, int icc_export_depth_intent ) throw( VError );
VImage icc_import( char* icc_import_input_profile, int icc_import_intent ) throw( VError );
VImage icc_import_embedded( int icc_import_embedded_intent ) throw( VError );
VImage icc_transform( char* icc_transform_input_profile, char* icc_transform_output_profile, int icc_transform_intent ) throw( VError );
VImage lab_morph( VDMask lab_morph_greyscale, double lab_morph_L_offset, double lab_morph_L_scale, double lab_morph_a_scale, double lab_morph_b_scale ) throw( VError );
VImage rad2float() throw( VError );
VImage sRGB2XYZ() throw( VError );
// headers for package conversion
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
static VImage gaussnoise( int gaussnoise_xsize, int gaussnoise_ysize, double gaussnoise_mean, double gaussnoise_sigma ) throw( VError );
VImage bandjoin( VImage bandjoin_in2 ) throw( VError );
static VImage black( int black_x_size, int black_y_size, int black_bands ) throw( VError );
VImage c2amph() throw( VError );
VImage c2imag() throw( VError );
VImage c2real() throw( VError );
VImage c2rect() throw( VError );
VImage clip2fmt( int clip2fmt_ofmt ) throw( VError );
VImage copy() throw( VError );
VImage copy_file() throw( VError );
VImage copy_morph( int copy_morph_Bands, int copy_morph_BandFmt, int copy_morph_Coding ) throw( VError );
VImage copy_swap() throw( VError );
VImage copy_set( int copy_set_Type, double copy_set_Xres, double copy_set_Yres, int copy_set_Xoffset, int copy_set_Yoffset ) throw( VError );
VImage extract_area( int extract_area_left, int extract_area_top, int extract_area_width, int extract_area_height ) throw( VError );
VImage extract_areabands( int extract_areabands_left, int extract_areabands_top, int extract_areabands_width, int extract_areabands_height, int extract_areabands_band, int extract_areabands_nbands ) throw( VError );
VImage extract_band( int extract_band_band ) throw( VError );
VImage extract_bands( int extract_bands_band, int extract_bands_nbands ) throw( VError );
VImage extract( int extract_left, int extract_top, int extract_width, int extract_height, int extract_band ) throw( VError );
VImage falsecolour() throw( VError );
VImage fliphor() throw( VError );
VImage flipver() throw( VError );
static VImage gbandjoin( std::vector<VImage> gbandjoin_in ) throw( VError );
VImage grid( int grid_tile_height, int grid_across, int grid_down ) throw( VError );
VImage insert( VImage insert_sub, int insert_x, int insert_y ) throw( VError );
VImage insert( VImage insert_sub, std::vector<int> insert_x, std::vector<int> insert_y ) throw( VError );
VImage insert_noexpand( VImage insert_noexpand_sub, int insert_noexpand_x, int insert_noexpand_y ) throw( VError );
VImage embed( int embed_type, int embed_x, int embed_y, int embed_width, int embed_height ) throw( VError );
VImage lrjoin( VImage lrjoin_in2 ) throw( VError );
VImage msb() throw( VError );
VImage msb_band( int msb_band_band ) throw( VError );
VImage replicate( int replicate_across, int replicate_down ) throw( VError );
VImage ri2c( VImage ri2c_in2 ) throw( VError );
VImage rot180() throw( VError );
VImage rot270() throw( VError );
VImage rot90() throw( VError );
VImage scale() throw( VError );
VImage scaleps() throw( VError );
VImage subsample( int subsample_xshrink, int subsample_yshrink ) throw( VError );
char* system( char* system_command ) throw( VError );
VImage system_image( char* system_image_in_format, char* system_image_out_format, char* system_image_command, char*& system_image_log ) throw( VError );
VImage tbjoin( VImage tbjoin_in2 ) throw( VError );
static VImage text( char* text_text, char* text_font, int text_width, int text_alignment, int text_dpi ) throw( VError );
VImage wrap( int wrap_x, int wrap_y ) throw( VError );
VImage zoom( int zoom_xfac, int zoom_yfac ) throw( VError );
// headers for package convolution
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
VImage aconvsep( VDMask aconvsep_matrix, int aconvsep_n_layers ) throw( VError );
VImage aconv( VDMask aconv_matrix, int aconv_n_layers, int aconv_cluster ) throw( VError );
VImage addgnoise( double addgnoise_sigma ) throw( VError );
VImage compass( VIMask compass_matrix ) throw( VError );
VImage contrast_surface( int contrast_surface_half_win_size, int contrast_surface_spacing ) throw( VError );
VImage conv( VIMask conv_matrix ) throw( VError );
VImage conv( VDMask conv_matrix ) throw( VError );
VImage convsep( VIMask convsep_matrix ) throw( VError );
VImage convsep( VDMask convsep_matrix ) throw( VError );
VImage fastcor( VImage fastcor_in2 ) throw( VError );
VImage gradcor( VImage gradcor_in2 ) throw( VError );
VImage gradient( VIMask gradient_matrix ) throw( VError );
VImage grad_x() throw( VError );
VImage grad_y() throw( VError );
VImage lindetect( VIMask lindetect_matrix ) throw( VError );
VImage sharpen( int sharpen_mask_size, double sharpen_x1, double sharpen_y2, double sharpen_y3, double sharpen_m1, double sharpen_m2 ) throw( VError );
VImage spcor( VImage spcor_in2 ) throw( VError );
// headers for package deprecated
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
VImage argb2rgba() throw( VError );
VImage flood_copy( int flood_copy_start_x, int flood_copy_start_y, std::vector<double> flood_copy_ink ) throw( VError );
VImage flood_blob_copy( int flood_blob_copy_start_x, int flood_blob_copy_start_y, std::vector<double> flood_blob_copy_ink ) throw( VError );
VImage flood_other_copy( VImage flood_other_copy_mark, int flood_other_copy_start_x, int flood_other_copy_start_y, int flood_other_copy_serial ) throw( VError );
VImage clip() throw( VError );
VImage c2ps() throw( VError );
VImage resize_linear( int resize_linear_X, int resize_linear_Y ) throw( VError );
VImage cmulnorm( VImage cmulnorm_in2 ) throw( VError );
VImage fav4( VImage fav4_in2, VImage fav4_in3, VImage fav4_in4 ) throw( VError );
VImage gadd( double gadd_a, double gadd_b, VImage gadd_in2, double gadd_c ) throw( VError );
VImage icc_export( char* icc_export_output_profile, int icc_export_intent ) throw( VError );
VImage litecor( VImage litecor_white, int litecor_clip, double litecor_factor ) throw( VError );
VImage affine( double affine_a, double affine_b, double affine_c, double affine_d, double affine_dx, double affine_dy, int affine_x, int affine_y, int affine_w, int affine_h ) throw( VError );
VImage clip2c() throw( VError );
VImage clip2cm() throw( VError );
VImage clip2d() throw( VError );
VImage clip2dcm() throw( VError );
VImage clip2f() throw( VError );
VImage clip2i() throw( VError );
VImage convsub( VIMask convsub_matrix, int convsub_xskip, int convsub_yskip ) throw( VError );
VImage convf( VDMask convf_matrix ) throw( VError );
VImage convsepf( VDMask convsepf_matrix ) throw( VError );
VImage clip2s() throw( VError );
VImage clip2ui() throw( VError );
VImage insertplace( VImage insertplace_sub, std::vector<int> insertplace_x, std::vector<int> insertplace_y ) throw( VError );
VImage clip2us() throw( VError );
VImage slice( double slice_thresh1, double slice_thresh2 ) throw( VError );
VImage segment( int& segment_segments ) throw( VError );
void line( int line_x1, int line_y1, int line_x2, int line_y2, int line_pelval ) throw( VError );
VImage thresh( double thresh_threshold ) throw( VError );
VImage convf_raw( VDMask convf_raw_matrix ) throw( VError );
VImage conv_raw( VIMask conv_raw_matrix ) throw( VError );
VImage contrast_surface_raw( int contrast_surface_raw_half_win_size, int contrast_surface_raw_spacing ) throw( VError );
VImage convsepf_raw( VDMask convsepf_raw_matrix ) throw( VError );
VImage convsep_raw( VIMask convsep_raw_matrix ) throw( VError );
VImage fastcor_raw( VImage fastcor_raw_in2 ) throw( VError );
VImage gradcor_raw( VImage gradcor_raw_in2 ) throw( VError );
VImage spcor_raw( VImage spcor_raw_in2 ) throw( VError );
VImage lhisteq_raw( int lhisteq_raw_width, int lhisteq_raw_height ) throw( VError );
VImage stdif_raw( double stdif_raw_a, double stdif_raw_m0, double stdif_raw_b, double stdif_raw_s0, int stdif_raw_xw, int stdif_raw_yw ) throw( VError );
VImage rank_raw( int rank_raw_xsize, int rank_raw_ysize, int rank_raw_n ) throw( VError );
VImage dilate_raw( VIMask dilate_raw_mask ) throw( VError );
VImage erode_raw( VIMask erode_raw_mask ) throw( VError );
VImage similarity_area( double similarity_area_a, double similarity_area_b, double similarity_area_dx, double similarity_area_dy, int similarity_area_x, int similarity_area_y, int similarity_area_w, int similarity_area_h ) throw( VError );
VImage similarity( double similarity_a, double similarity_b, double similarity_dx, double similarity_dy ) throw( VError );
static VImage mask2vips( VDMask mask2vips_input ) throw( VError );
VDMask vips2mask() throw( VError );
void insertplace( VImage insertplace_sub, int insertplace_x, int insertplace_y ) throw( VError );
void circle( int circle_cx, int circle_cy, int circle_radius, int circle_intensity ) throw( VError );
VImage andimage( VImage andimage_in2 ) throw( VError );
VImage andimage( int andimage_c ) throw( VError );
VImage andimage( std::vector<double> andimage_vec ) throw( VError );
VImage orimage( VImage orimage_in2 ) throw( VError );
VImage orimage( int orimage_c ) throw( VError );
VImage orimage( std::vector<double> orimage_vec ) throw( VError );
VImage eorimage( VImage eorimage_in2 ) throw( VError );
VImage eorimage( int eorimage_c ) throw( VError );
VImage eorimage( std::vector<double> eorimage_vec ) throw( VError );
VImage shiftleft( std::vector<double> shiftleft_vec ) throw( VError );
VImage shiftleft( int shiftleft_c ) throw( VError );
VImage shiftright( std::vector<double> shiftright_vec ) throw( VError );
VImage shiftright( int shiftright_c ) throw( VError );
VImage blend( VImage blend_in1, VImage blend_in2 ) throw( VError );
VImage equal( VImage equal_in2 ) throw( VError );
VImage equal( std::vector<double> equal_vec ) throw( VError );
VImage equal( double equal_c ) throw( VError );
VImage ifthenelse( VImage ifthenelse_in1, VImage ifthenelse_in2 ) throw( VError );
VImage less( VImage less_in2 ) throw( VError );
VImage less( std::vector<double> less_vec ) throw( VError );
VImage less( double less_c ) throw( VError );
VImage lesseq( VImage lesseq_in2 ) throw( VError );
VImage lesseq( std::vector<double> lesseq_vec ) throw( VError );
VImage lesseq( double lesseq_c ) throw( VError );
VImage more( VImage more_in2 ) throw( VError );
VImage more( std::vector<double> more_vec ) throw( VError );
VImage more( double more_c ) throw( VError );
VImage moreeq( VImage moreeq_in2 ) throw( VError );
VImage moreeq( std::vector<double> moreeq_vec ) throw( VError );
VImage moreeq( double moreeq_c ) throw( VError );
VImage notequal( VImage notequal_in2 ) throw( VError );
VImage notequal( std::vector<double> notequal_vec ) throw( VError );
VImage notequal( double notequal_c ) throw( VError );
VImage quadratic( VImage quadratic_coeff ) throw( VError );
// headers for package format
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
static VImage csv2vips( char* csv2vips_filename ) throw( VError );
static VImage fits2vips( char* fits2vips_in ) throw( VError );
static VImage jpeg2vips( char* jpeg2vips_in ) throw( VError );
static VImage magick2vips( char* magick2vips_in ) throw( VError );
static VImage png2vips( char* png2vips_in ) throw( VError );
static VImage exr2vips( char* exr2vips_in ) throw( VError );
static VImage ppm2vips( char* ppm2vips_filename ) throw( VError );
static VImage analyze2vips( char* analyze2vips_filename ) throw( VError );
static VImage tiff2vips( char* tiff2vips_in ) throw( VError );
void vips2csv( char* vips2csv_filename ) throw( VError );
void vips2dz( char* vips2dz_out ) throw( VError );
void vips2jpeg( char* vips2jpeg_out ) throw( VError );
void vips2mimejpeg( int vips2mimejpeg_qfac ) throw( VError );
void vips2png( char* vips2png_out ) throw( VError );
void vips2ppm( char* vips2ppm_filename ) throw( VError );
void vips2tiff( char* vips2tiff_out ) throw( VError );
// headers for package freq_filt
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
static VImage create_fmask( int create_fmask_width, int create_fmask_height, int create_fmask_type, double create_fmask_p1, double create_fmask_p2, double create_fmask_p3, double create_fmask_p4, double create_fmask_p5 ) throw( VError );
VImage disp_ps() throw( VError );
VImage flt_image_freq( int flt_image_freq_type, double flt_image_freq_p1, double flt_image_freq_p2, double flt_image_freq_p3, double flt_image_freq_p4, double flt_image_freq_p5 ) throw( VError );
static VImage fractsurf( int fractsurf_size, double fractsurf_dimension ) throw( VError );
VImage freqflt( VImage freqflt_mask ) throw( VError );
VImage fwfft() throw( VError );
VImage rotquad() throw( VError );
VImage invfft() throw( VError );
VImage phasecor_fft( VImage phasecor_fft_in2 ) throw( VError );
VImage invfftr() throw( VError );
// headers for package histograms_lut
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
VImage gammacorrect( double gammacorrect_exponent ) throw( VError );
VImage heq( int heq_band_number ) throw( VError );
VImage hist( int hist_band_number ) throw( VError );
VImage histcum() throw( VError );
VImage histeq() throw( VError );
VImage hist_indexed( VImage hist_indexed_value ) throw( VError );
VImage histgr( int histgr_band_number ) throw( VError );
VImage histnD( int histnD_bins ) throw( VError );
VImage histnorm() throw( VError );
VImage histplot() throw( VError );
VImage histspec( VImage histspec_ref ) throw( VError );
VImage hsp( VImage hsp_ref ) throw( VError );
static VImage identity( int identity_nbands ) throw( VError );
static VImage identity_ushort( int identity_ushort_nbands, int identity_ushort_size ) throw( VError );
int ismonotonic() throw( VError );
VImage lhisteq( int lhisteq_width, int lhisteq_height ) throw( VError );
int mpercent( double mpercent_percent ) throw( VError );
static VImage invertlut( VDMask invertlut_measures, int invertlut_lut_size ) throw( VError );
static VImage buildlut( VDMask buildlut_xyes ) throw( VError );
VImage maplut( VImage maplut_lut ) throw( VError );
VImage project( VImage& project_vout ) throw( VError );
VImage stdif( double stdif_a, double stdif_m0, double stdif_b, double stdif_s0, int stdif_xw, int stdif_yw ) throw( VError );
VImage tone_analyse( double tone_analyse_Ps, double tone_analyse_Pm, double tone_analyse_Ph, double tone_analyse_S, double tone_analyse_M, double tone_analyse_H ) throw( VError );
static VImage tone_build( double tone_build_Lb, double tone_build_Lw, double tone_build_Ps, double tone_build_Pm, double tone_build_Ph, double tone_build_S, double tone_build_M, double tone_build_H ) throw( VError );
static VImage tone_build_range( int tone_build_range_in_max, int tone_build_range_out_max, double tone_build_range_Lb, double tone_build_range_Lw, double tone_build_range_Ps, double tone_build_range_Pm, double tone_build_range_Ph, double tone_build_range_S, double tone_build_range_M, double tone_build_range_H ) throw( VError );
VImage tone_map( VImage tone_map_lut ) throw( VError );
// headers for package inplace
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
void draw_circle( int draw_circle_cx, int draw_circle_cy, int draw_circle_radius, int draw_circle_fill, std::vector<double> draw_circle_ink ) throw( VError );
void draw_rect( int draw_rect_left, int draw_rect_top, int draw_rect_width, int draw_rect_height, int draw_rect_fill, std::vector<double> draw_rect_ink ) throw( VError );
void draw_line( int draw_line_x1, int draw_line_y1, int draw_line_x2, int draw_line_y2, std::vector<double> draw_line_ink ) throw( VError );
void draw_point( int draw_point_x, int draw_point_y, std::vector<double> draw_point_ink ) throw( VError );
void draw_smudge( int draw_smudge_left, int draw_smudge_top, int draw_smudge_width, int draw_smudge_height ) throw( VError );
void draw_flood( int draw_flood_x, int draw_flood_y, std::vector<double> draw_flood_ink ) throw( VError );
void draw_flood_blob( int draw_flood_blob_x, int draw_flood_blob_y, std::vector<double> draw_flood_blob_ink ) throw( VError );
void draw_flood_other( VImage draw_flood_other_test, int draw_flood_other_x, int draw_flood_other_y, int draw_flood_other_serial ) throw( VError );
void draw_image( VImage draw_image_sub, int draw_image_x, int draw_image_y ) throw( VError );
void draw_mask( VImage draw_mask_mask, int draw_mask_x, int draw_mask_y, std::vector<double> draw_mask_ink ) throw( VError );
VImage line( VImage line_mask, VImage line_ink, std::vector<int> line_x1, std::vector<int> line_y1, std::vector<int> line_x2, std::vector<int> line_y2 ) throw( VError );
// headers for package iofuncs
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
static VImage binfile( char* binfile_filename, int binfile_width, int binfile_height, int binfile_bands, int binfile_offset ) throw( VError );
VImage cache( int cache_tile_width, int cache_tile_height, int cache_max_tiles ) throw( VError );
char* getext() throw( VError );
int header_get_typeof( char* header_get_typeof_field ) throw( VError );
int header_int( char* header_int_field ) throw( VError );
double header_double( char* header_double_field ) throw( VError );
char* header_string( char* header_string_field ) throw( VError );
char* history_get() throw( VError );
void printdesc() throw( VError );
// headers for package mask
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
// headers for package morphology
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
double cntlines( int cntlines_direction ) throw( VError );
VImage dilate( VIMask dilate_mask ) throw( VError );
VImage rank( int rank_xsize, int rank_ysize, int rank_n ) throw( VError );
static VImage rank_image( std::vector<VImage> rank_image_in, int rank_image_index ) throw( VError );
static VImage maxvalue( std::vector<VImage> maxvalue_in ) throw( VError );
VImage label_regions( int& label_regions_segments ) throw( VError );
VImage zerox( int zerox_flag ) throw( VError );
VImage erode( VIMask erode_mask ) throw( VError );
VImage profile( int profile_direction ) throw( VError );
// headers for package mosaicing
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
VImage align_bands() throw( VError );
double correl( VImage correl_sec, int correl_xref, int correl_yref, int correl_xsec, int correl_ysec, int correl_hwindowsize, int correl_hsearchsize, int& correl_x, int& correl_y ) throw( VError );
int _find_lroverlap( VImage _find_lroverlap_sec, int _find_lroverlap_bandno, int _find_lroverlap_xr, int _find_lroverlap_yr, int _find_lroverlap_xs, int _find_lroverlap_ys, int _find_lroverlap_halfcorrelation, int _find_lroverlap_halfarea, int& _find_lroverlap_dy0, double& _find_lroverlap_scale1, double& _find_lroverlap_angle1, double& _find_lroverlap_dx1, double& _find_lroverlap_dy1 ) throw( VError );
int _find_tboverlap( VImage _find_tboverlap_sec, int _find_tboverlap_bandno, int _find_tboverlap_xr, int _find_tboverlap_yr, int _find_tboverlap_xs, int _find_tboverlap_ys, int _find_tboverlap_halfcorrelation, int _find_tboverlap_halfarea, int& _find_tboverlap_dy0, double& _find_tboverlap_scale1, double& _find_tboverlap_angle1, double& _find_tboverlap_dx1, double& _find_tboverlap_dy1 ) throw( VError );
VImage global_balance( double global_balance_gamma ) throw( VError );
VImage global_balancef( double global_balancef_gamma ) throw( VError );
VImage lrmerge( VImage lrmerge_sec, int lrmerge_dx, int lrmerge_dy, int lrmerge_mwidth ) throw( VError );
VImage lrmerge1( VImage lrmerge1_sec, int lrmerge1_xr1, int lrmerge1_yr1, int lrmerge1_xs1, int lrmerge1_ys1, int lrmerge1_xr2, int lrmerge1_yr2, int lrmerge1_xs2, int lrmerge1_ys2, int lrmerge1_mwidth ) throw( VError );
VImage lrmosaic( VImage lrmosaic_sec, int lrmosaic_bandno, int lrmosaic_xr, int lrmosaic_yr, int lrmosaic_xs, int lrmosaic_ys, int lrmosaic_halfcorrelation, int lrmosaic_halfarea, int lrmosaic_balancetype, int lrmosaic_mwidth ) throw( VError );
VImage lrmosaic1( VImage lrmosaic1_sec, int lrmosaic1_bandno, int lrmosaic1_xr1, int lrmosaic1_yr1, int lrmosaic1_xs1, int lrmosaic1_ys1, int lrmosaic1_xr2, int lrmosaic1_yr2, int lrmosaic1_xs2, int lrmosaic1_ys2, int lrmosaic1_halfcorrelation, int lrmosaic1_halfarea, int lrmosaic1_balancetype, int lrmosaic1_mwidth ) throw( VError );
VImage match_linear( VImage match_linear_sec, int match_linear_xref1, int match_linear_yref1, int match_linear_xsec1, int match_linear_ysec1, int match_linear_xref2, int match_linear_yref2, int match_linear_xsec2, int match_linear_ysec2 ) throw( VError );
VImage match_linear_search( VImage match_linear_search_sec, int match_linear_search_xref1, int match_linear_search_yref1, int match_linear_search_xsec1, int match_linear_search_ysec1, int match_linear_search_xref2, int match_linear_search_yref2, int match_linear_search_xsec2, int match_linear_search_ysec2, int match_linear_search_hwindowsize, int match_linear_search_hsearchsize ) throw( VError );
double maxpos_subpel( double& maxpos_subpel_y ) throw( VError );
VImage remosaic( char* remosaic_old_str, char* remosaic_new_str ) throw( VError );
VImage tbmerge( VImage tbmerge_sec, int tbmerge_dx, int tbmerge_dy, int tbmerge_mwidth ) throw( VError );
VImage tbmerge1( VImage tbmerge1_sec, int tbmerge1_xr1, int tbmerge1_yr1, int tbmerge1_xs1, int tbmerge1_ys1, int tbmerge1_xr2, int tbmerge1_yr2, int tbmerge1_xs2, int tbmerge1_ys2, int tbmerge1_mwidth ) throw( VError );
VImage tbmosaic( VImage tbmosaic_sec, int tbmosaic_bandno, int tbmosaic_xr, int tbmosaic_yr, int tbmosaic_xs, int tbmosaic_ys, int tbmosaic_halfcorrelation, int tbmosaic_halfarea, int tbmosaic_balancetype, int tbmosaic_mwidth ) throw( VError );
VImage tbmosaic1( VImage tbmosaic1_sec, int tbmosaic1_bandno, int tbmosaic1_xr1, int tbmosaic1_yr1, int tbmosaic1_xs1, int tbmosaic1_ys1, int tbmosaic1_xr2, int tbmosaic1_yr2, int tbmosaic1_xs2, int tbmosaic1_ys2, int tbmosaic1_halfcorrelation, int tbmosaic1_halfarea, int tbmosaic1_balancetype, int tbmosaic1_mwidth ) throw( VError );
// headers for package other
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
VImage benchmark() throw( VError );
double benchmark2() throw( VError );
VImage benchmarkn( int benchmarkn_n ) throw( VError );
static VImage eye( int eye_xsize, int eye_ysize, double eye_factor ) throw( VError );
static VImage grey( int grey_xsize, int grey_ysize ) throw( VError );
static VImage feye( int feye_xsize, int feye_ysize, double feye_factor ) throw( VError );
static VImage fgrey( int fgrey_xsize, int fgrey_ysize ) throw( VError );
static VImage fzone( int fzone_size ) throw( VError );
static VImage make_xy( int make_xy_xsize, int make_xy_ysize ) throw( VError );
static VImage sines( int sines_xsize, int sines_ysize, double sines_horfreq, double sines_verfreq ) throw( VError );
static VImage zone( int zone_size ) throw( VError );
// headers for package resample
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
VImage rightshift_size( int rightshift_size_xshift, int rightshift_size_yshift, int rightshift_size_band_fmt ) throw( VError );
VImage shrink( double shrink_xfac, double shrink_yfac ) throw( VError );
VImage stretch3( double stretch3_xdisp, double stretch3_ydisp ) throw( VError );
VImage affinei( char* affinei_interpolate, double affinei_a, double affinei_b, double affinei_c, double affinei_d, double affinei_dx, double affinei_dy, int affinei_x, int affinei_y, int affinei_w, int affinei_h ) throw( VError );
VImage affinei_all( char* affinei_all_interpolate, double affinei_all_a, double affinei_all_b, double affinei_all_c, double affinei_all_d, double affinei_all_dx, double affinei_all_dy ) throw( VError );
// headers for package video
// this file automatically generated from
// VIPS library 7.34.0-Tue Jun 11 11:18:24 BST 2013
static VImage video_test( int video_test_brightness, int video_test_error ) throw( VError );
static VImage video_v4l1( char* video_v4l1_device, int video_v4l1_channel, int video_v4l1_brightness, int video_v4l1_colour, int video_v4l1_contrast, int video_v4l1_hue, int video_v4l1_ngrabs ) throw( VError );

6204
cplusplus/vips-operators.cc
View File

File diff suppressed because it is too large Load Diff

2
libvips/include/vips/image.h
View File

@ -416,7 +416,7 @@ VipsImage *vips_image_new_from_file( const char *name, ... )
VipsImage *vips_image_new_from_file_RW( const char *filename ); VipsImage *vips_image_new_from_file_RW( const char *filename );
VipsImage *vips_image_new_from_file_raw( const char *filename, VipsImage *vips_image_new_from_file_raw( const char *filename,
int xsize, int ysize, int bands, guint64 offset ); int xsize, int ysize, int bands, guint64 offset );
VipsImage *vips_image_new_from_memory( void *buffer, size_t size, VipsImage *vips_image_new_from_memory( void *data, size_t size,
int width, int height, int bands, VipsBandFormat format ); int width, int height, int bands, VipsBandFormat format );
VipsImage *vips_image_new_from_buffer( void *buf, size_t len, VipsImage *vips_image_new_from_buffer( void *buf, size_t len,
const char *option_string, ... ) const char *option_string, ... )

8
libvips/iofuncs/image.c
View File

@ -1944,7 +1944,7 @@ vips_image_new_from_file_raw( const char *filename,
/** /**
* vips_image_new_from_memory: * vips_image_new_from_memory:
* @buffer: (array length=size) (element-type guint8) (transfer full): start of memory area * @data: (array length=size) (element-type guint8) (transfer full): start of memory area
* @size: length of memory area * @size: length of memory area
* @width: image width * @width: image width
* @height: image height * @height: image height
@ -1967,7 +1967,7 @@ vips_image_new_from_file_raw( const char *filename,
* Returns: the new #VipsImage, or %NULL on error. * Returns: the new #VipsImage, or %NULL on error.
*/ */
VipsImage * VipsImage *
vips_image_new_from_memory( void *buffer, size_t size, vips_image_new_from_memory( void *data, size_t size,
int width, int height, int bands, VipsBandFormat format ) int width, int height, int bands, VipsBandFormat format )
{ {
VipsImage *image; VipsImage *image;
@ -1978,7 +1978,7 @@ vips_image_new_from_memory( void *buffer, size_t size,
g_object_set( image, g_object_set( image,
"filename", vips_image_temp_name(), "filename", vips_image_temp_name(),
"mode", "m", "mode", "m",
"foreign_buffer", buffer, "foreign_buffer", data,
"width", width, "width", width,
"height", height, "height", height,
"bands", bands, "bands", bands,
@ -1989,7 +1989,7 @@ vips_image_new_from_memory( void *buffer, size_t size,
return( NULL ); return( NULL );
} }
/* Allow len == 0 meaning don't check. Used for im_image() /* Allow len == 0, meaning don't check. Used for im_image()
* compatibility. * compatibility.
*/ */
if( size > 0 && if( size > 0 &&