diff --git a/cplusplus/include/vips/vips-operators.h b/cplusplus/include/vips/vips-operators.h index e2aa71f1..e51f4cd9 100644 --- a/cplusplus/include/vips/vips-operators.h +++ b/cplusplus/include/vips/vips-operators.h @@ -1,5 +1,5 @@ // headers for vips operations -// Tue Jan 6 11:41:51 GMT 2015 +// Tue Oct 6 16:54:32 BST 2015 // this file is generated automatically, do not edit! static void system( char * cmd_format , VOption *options = 0 ) @@ -122,8 +122,16 @@ VImage ifthenelse( VImage in1 , VImage in2 , VOption *options = 0 ) throw( VError ); VImage recomb( VImage m , VOption *options = 0 ) throw( VError ); +VImage bandfold( VOption *options = 0 ) + throw( VError ); +VImage bandunfold( VOption *options = 0 ) + throw( VError ); VImage flatten( VOption *options = 0 ) throw( VError ); +VImage premultiply( VOption *options = 0 ) + throw( VError ); +VImage unpremultiply( VOption *options = 0 ) + throw( VError ); VImage grid( int tile_height , int across , int down , VOption *options = 0 ) throw( VError ); VImage scale( VOption *options = 0 ) @@ -136,6 +144,8 @@ VImage subsample( int xfac , int yfac , VOption *options = 0 ) throw( VError ); VImage msb( VOption *options = 0 ) throw( VError ); +VImage byteswap( VOption *options = 0 ) + throw( VError ); VImage falsecolour( VOption *options = 0 ) throw( VError ); VImage gamma( VOption *options = 0 ) @@ -318,9 +328,9 @@ VImage float2rad( VOption *options = 0 ) throw( VError ); VImage LabQ2sRGB( VOption *options = 0 ) throw( VError ); -VImage sRGB2scRGB( VOption *options = 0 ) +VImage sRGB2HSV( VOption *options = 0 ) throw( VError ); -VImage scRGB2sRGB( VOption *options = 0 ) +VImage HSV2sRGB( VOption *options = 0 ) throw( VError ); VImage icc_import( VOption *options = 0 ) throw( VError ); @@ -334,6 +344,12 @@ VImage dE00( VImage right , VOption *options = 0 ) throw( VError ); VImage dECMC( VImage right , VOption *options = 0 ) throw( VError ); +VImage sRGB2scRGB( VOption *options = 0 ) + throw( VError ); +VImage scRGB2BW( VOption *options = 0 ) + throw( VError ); +VImage scRGB2sRGB( VOption *options = 0 ) + throw( VError ); VImage maplut( VImage lut , VOption *options = 0 ) throw( VError ); int percent( double percent , VOption *options = 0 ) @@ -354,6 +370,8 @@ VImage hist_local( int width , int height , VOption *options = 0 ) throw( VError ); bool hist_ismonotonic( VOption *options = 0 ) throw( VError ); +double hist_entropy( VOption *options = 0 ) + throw( VError ); VImage conv( VImage mask , VOption *options = 0 ) throw( VError ); VImage compass( VImage mask , VOption *options = 0 ) diff --git a/cplusplus/vips-operators.cpp b/cplusplus/vips-operators.cpp index 0bc154fd..b3cf91f2 100644 --- a/cplusplus/vips-operators.cpp +++ b/cplusplus/vips-operators.cpp @@ -1,5 +1,5 @@ // bodies for vips operations -// Tue Jan 6 11:44:30 GMT 2015 +// Tue Oct 6 16:53:55 BST 2015 // this file is generated automatically, do not edit! void VImage::system( char * cmd_format , VOption *options ) @@ -834,6 +834,32 @@ VImage VImage::recomb( VImage m , VOption *options ) return( out ); } +VImage VImage::bandfold( VOption *options ) + throw( VError ) +{ + VImage out; + + call( "bandfold" , + (options ? options : VImage::option()) -> + set( "out", &out ) -> + set( "in", *this ) ); + + return( out ); +} + +VImage VImage::bandunfold( VOption *options ) + throw( VError ) +{ + VImage out; + + call( "bandunfold" , + (options ? options : VImage::option()) -> + set( "out", &out ) -> + set( "in", *this ) ); + + return( out ); +} + VImage VImage::flatten( VOption *options ) throw( VError ) { @@ -847,6 +873,32 @@ VImage VImage::flatten( VOption *options ) return( out ); } +VImage VImage::premultiply( VOption *options ) + throw( VError ) +{ + VImage out; + + call( "premultiply" , + (options ? options : VImage::option()) -> + set( "out", &out ) -> + set( "in", *this ) ); + + return( out ); +} + +VImage VImage::unpremultiply( VOption *options ) + throw( VError ) +{ + VImage out; + + call( "unpremultiply" , + (options ? options : VImage::option()) -> + set( "out", &out ) -> + set( "in", *this ) ); + + return( out ); +} + VImage VImage::grid( int tile_height , int across , int down , VOption *options ) throw( VError ) { @@ -932,6 +984,19 @@ VImage VImage::msb( VOption *options ) return( out ); } +VImage VImage::byteswap( VOption *options ) + throw( VError ) +{ + VImage out; + + call( "byteswap" , + (options ? options : VImage::option()) -> + set( "out", &out ) -> + set( "in", *this ) ); + + return( out ); +} + VImage VImage::falsecolour( VOption *options ) throw( VError ) { @@ -2109,12 +2174,12 @@ VImage VImage::LabQ2sRGB( VOption *options ) return( out ); } -VImage VImage::sRGB2scRGB( VOption *options ) +VImage VImage::sRGB2HSV( VOption *options ) throw( VError ) { VImage out; - call( "sRGB2scRGB" , + call( "sRGB2HSV" , (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) ); @@ -2122,12 +2187,12 @@ VImage VImage::sRGB2scRGB( VOption *options ) return( out ); } -VImage VImage::scRGB2sRGB( VOption *options ) +VImage VImage::HSV2sRGB( VOption *options ) throw( VError ) { VImage out; - call( "scRGB2sRGB" , + call( "HSV2sRGB" , (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) ); @@ -2217,6 +2282,45 @@ VImage VImage::dECMC( VImage right , VOption *options ) return( out ); } +VImage VImage::sRGB2scRGB( VOption *options ) + throw( VError ) +{ + VImage out; + + call( "sRGB2scRGB" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) ); + + return( out ); +} + +VImage VImage::scRGB2BW( VOption *options ) + throw( VError ) +{ + VImage out; + + call( "scRGB2BW" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) ); + + return( out ); +} + +VImage VImage::scRGB2sRGB( VOption *options ) + throw( VError ) +{ + VImage out; + + call( "scRGB2sRGB" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) ); + + return( out ); +} + VImage VImage::maplut( VImage lut , VOption *options ) throw( VError ) { @@ -2354,6 +2458,19 @@ bool VImage::hist_ismonotonic( VOption *options ) return( monotonic ); } +double VImage::hist_entropy( VOption *options ) + throw( VError ) +{ + double out; + + call( "hist_entropy" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) ); + + return( out ); +} + VImage VImage::conv( VImage mask , VOption *options ) throw( VError ) {