From ca51b46e9ae25ea4e87fdee004838ef0af703514 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Sat, 7 Nov 2015 20:54:00 +0000 Subject: [PATCH] docs, c++, all done --- TODO | 2 - cplusplus/include/vips/vips-operators.h | 10 ++++- cplusplus/vips-operators.cpp | 59 ++++++++++++++++++++++++- doc/function-list.xml | 5 +++ 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 7faf4de2..6d1bf00f 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,3 @@ -- need to update docs, c++ binding - - test suite is broken, float->int mask I guess - looks like we have a race in tiled threadcache? see diff --git a/cplusplus/include/vips/vips-operators.h b/cplusplus/include/vips/vips-operators.h index e51f4cd9..5e61f149 100644 --- a/cplusplus/include/vips/vips-operators.h +++ b/cplusplus/include/vips/vips-operators.h @@ -1,5 +1,5 @@ // headers for vips operations -// Tue Oct 6 16:54:32 BST 2015 +// Sat Nov 7 20:36:13 GMT 2015 // this file is generated automatically, do not edit! static void system( char * cmd_format , VOption *options = 0 ) @@ -102,6 +102,8 @@ VImage extract_band( int band , VOption *options = 0 ) throw( VError ); static VImage bandjoin( std::vector in , VOption *options = 0 ) throw( VError ); +VImage bandjoin_const( std::vector c , VOption *options = 0 ) + throw( VError ); static VImage bandrank( std::vector in , VOption *options = 0 ) throw( VError ); VImage bandmean( VOption *options = 0 ) @@ -280,6 +282,12 @@ void fitssave( char * filename , VOption *options = 0 ) throw( VError ); VImage shrink( double xshrink , double yshrink , VOption *options = 0 ) throw( VError ); +VImage shrinkh( int xshrink , VOption *options = 0 ) + throw( VError ); +VImage shrinkv( int yshrink , VOption *options = 0 ) + throw( VError ); +VImage shrink2( double xshrink , double yshrink , VOption *options = 0 ) + throw( VError ); VImage quadratic( VImage coeff , VOption *options = 0 ) throw( VError ); VImage affine( std::vector matrix , VOption *options = 0 ) diff --git a/cplusplus/vips-operators.cpp b/cplusplus/vips-operators.cpp index b3cf91f2..e6a9c298 100644 --- a/cplusplus/vips-operators.cpp +++ b/cplusplus/vips-operators.cpp @@ -1,5 +1,5 @@ // bodies for vips operations -// Tue Oct 6 16:53:55 BST 2015 +// Sat Nov 7 20:36:01 GMT 2015 // this file is generated automatically, do not edit! void VImage::system( char * cmd_format , VOption *options ) @@ -696,6 +696,20 @@ VImage VImage::bandjoin( std::vector in , VOption *options ) return( out ); } +VImage VImage::bandjoin_const( std::vector c , VOption *options ) + throw( VError ) +{ + VImage out; + + call( "bandjoin_const" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) -> + set( "c", c ) ); + + return( out ); +} + VImage VImage::bandrank( std::vector in , VOption *options ) throw( VError ) { @@ -1858,6 +1872,49 @@ VImage VImage::shrink( double xshrink , double yshrink , VOption *options ) return( out ); } +VImage VImage::shrinkh( int xshrink , VOption *options ) + throw( VError ) +{ + VImage out; + + call( "shrinkh" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) -> + set( "xshrink", xshrink ) ); + + return( out ); +} + +VImage VImage::shrinkv( int yshrink , VOption *options ) + throw( VError ) +{ + VImage out; + + call( "shrinkv" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) -> + set( "yshrink", yshrink ) ); + + return( out ); +} + +VImage VImage::shrink2( double xshrink , double yshrink , VOption *options ) + throw( VError ) +{ + VImage out; + + call( "shrink2" , + (options ? options : VImage::option()) -> + set( "in", *this ) -> + set( "out", &out ) -> + set( "xshrink", xshrink ) -> + set( "yshrink", yshrink ) ); + + return( out ); +} + VImage VImage::quadratic( VImage coeff , VOption *options ) throw( VError ) { diff --git a/doc/function-list.xml b/doc/function-list.xml index 4f3e374e..5bf42e9f 100644 --- a/doc/function-list.xml +++ b/doc/function-list.xml @@ -333,6 +333,11 @@ bandwise join a set of images vips_bandjoin(), vips_bandjoin2() + + bandjoin_const + appendd a set of constants to an image + vips_bandjoin_const(), vips_bandjoin_const1() + bandrank band-wise rank of a set of images