diff --git a/cplusplus/include/vips/vips-operators.h b/cplusplus/include/vips/vips-operators.h index 620465a8..61da4ae2 100644 --- a/cplusplus/include/vips/vips-operators.h +++ b/cplusplus/include/vips/vips-operators.h @@ -1,3 +1,7 @@ +// headers for vips operations +// Thu 18 Aug 16:02:54 BST 2016 +// this file is generated automatically, do not edit! + static void system( char * cmd_format , VOption *options = 0 ); VImage add( VImage right , VOption *options = 0 ); VImage subtract( VImage right , VOption *options = 0 ); @@ -148,12 +152,12 @@ VipsBlob * webpsave_buffer( VOption *options = 0 ); void tiffsave( char * filename , VOption *options = 0 ); void fitssave( char * filename , VOption *options = 0 ); VImage mapim( VImage index , VOption *options = 0 ); -VImage shrink( double xshrink , double yshrink , VOption *options = 0 ); -VImage shrinkh( int xshrink , VOption *options = 0 ); -VImage shrinkv( int yshrink , VOption *options = 0 ); -VImage reduceh( double xshrink , VOption *options = 0 ); -VImage reducev( double yshrink , VOption *options = 0 ); -VImage reduce( double xshrink , double yshrink , VOption *options = 0 ); +VImage shrink( double hshrink , double vshrink , VOption *options = 0 ); +VImage shrinkh( int hshrink , VOption *options = 0 ); +VImage shrinkv( int vshrink , VOption *options = 0 ); +VImage reduceh( double hshrink , VOption *options = 0 ); +VImage reducev( double vshrink , VOption *options = 0 ); +VImage reduce( double hshrink , double vshrink , VOption *options = 0 ); VImage quadratic( VImage coeff , VOption *options = 0 ); VImage affine( std::vector matrix , VOption *options = 0 ); VImage similarity( VOption *options = 0 ); @@ -201,8 +205,12 @@ VImage hist_local( int width , int height , VOption *options = 0 ); bool hist_ismonotonic( VOption *options = 0 ); double hist_entropy( VOption *options = 0 ); VImage conv( VImage mask , VOption *options = 0 ); +VImage conva( VImage mask , VOption *options = 0 ); +VImage convf( VImage mask , VOption *options = 0 ); +VImage convi( VImage mask , VOption *options = 0 ); VImage compass( VImage mask , VOption *options = 0 ); VImage convsep( VImage mask , VOption *options = 0 ); +VImage convasep( VImage mask , VOption *options = 0 ); VImage fastcor( VImage ref , VOption *options = 0 ); VImage spcor( VImage ref , VOption *options = 0 ); VImage sharpen( VOption *options = 0 ); diff --git a/cplusplus/vips-operators.cpp b/cplusplus/vips-operators.cpp index 1cb98e9f..7a0721b2 100644 --- a/cplusplus/vips-operators.cpp +++ b/cplusplus/vips-operators.cpp @@ -1,3 +1,7 @@ +// bodies for vips operations +// Thu 18 Aug 16:01:57 BST 2016 +// this file is generated automatically, do not edit! + void VImage::system( char * cmd_format , VOption *options ) { call( "system" , @@ -1849,7 +1853,7 @@ VImage VImage::mapim( VImage index , VOption *options ) return( out ); } -VImage VImage::shrink( double xshrink , double yshrink , VOption *options ) +VImage VImage::shrink( double hshrink , double vshrink , VOption *options ) { VImage out; @@ -1857,13 +1861,13 @@ VImage VImage::shrink( double xshrink , double yshrink , VOption *options ) (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "xshrink", xshrink ) -> - set( "yshrink", yshrink ) ); + set( "hshrink", hshrink ) -> + set( "vshrink", vshrink ) ); return( out ); } -VImage VImage::shrinkh( int xshrink , VOption *options ) +VImage VImage::shrinkh( int hshrink , VOption *options ) { VImage out; @@ -1871,12 +1875,12 @@ VImage VImage::shrinkh( int xshrink , VOption *options ) (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "xshrink", xshrink ) ); + set( "hshrink", hshrink ) ); return( out ); } -VImage VImage::shrinkv( int yshrink , VOption *options ) +VImage VImage::shrinkv( int vshrink , VOption *options ) { VImage out; @@ -1884,12 +1888,12 @@ VImage VImage::shrinkv( int yshrink , VOption *options ) (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "yshrink", yshrink ) ); + set( "vshrink", vshrink ) ); return( out ); } -VImage VImage::reduceh( double xshrink , VOption *options ) +VImage VImage::reduceh( double hshrink , VOption *options ) { VImage out; @@ -1897,12 +1901,12 @@ VImage VImage::reduceh( double xshrink , VOption *options ) (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "xshrink", xshrink ) ); + set( "hshrink", hshrink ) ); return( out ); } -VImage VImage::reducev( double yshrink , VOption *options ) +VImage VImage::reducev( double vshrink , VOption *options ) { VImage out; @@ -1910,12 +1914,12 @@ VImage VImage::reducev( double yshrink , VOption *options ) (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "yshrink", yshrink ) ); + set( "vshrink", vshrink ) ); return( out ); } -VImage VImage::reduce( double xshrink , double yshrink , VOption *options ) +VImage VImage::reduce( double hshrink , double vshrink , VOption *options ) { VImage out; @@ -1923,8 +1927,8 @@ VImage VImage::reduce( double xshrink , double yshrink , VOption *options ) (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "xshrink", xshrink ) -> - set( "yshrink", yshrink ) ); + set( "hshrink", hshrink ) -> + set( "vshrink", vshrink ) ); return( out ); } @@ -2509,6 +2513,45 @@ VImage VImage::conv( VImage mask , VOption *options ) return( out ); } +VImage VImage::conva( VImage mask , VOption *options ) +{ + VImage out; + + call( "conva" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) -> + set( "mask", mask ) ); + + return( out ); +} + +VImage VImage::convf( VImage mask , VOption *options ) +{ + VImage out; + + call( "convf" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) -> + set( "mask", mask ) ); + + return( out ); +} + +VImage VImage::convi( VImage mask , VOption *options ) +{ + VImage out; + + call( "convi" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) -> + set( "mask", mask ) ); + + return( out ); +} + VImage VImage::compass( VImage mask , VOption *options ) { VImage out; @@ -2535,6 +2578,19 @@ VImage VImage::convsep( VImage mask , VOption *options ) return( out ); } +VImage VImage::convasep( VImage mask , VOption *options ) +{ + VImage out; + + call( "convasep" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) -> + set( "mask", mask ) ); + + return( out ); +} + VImage VImage::fastcor( VImage ref , VOption *options ) { VImage out;