diff --git a/cplusplus/VImage.cpp b/cplusplus/VImage.cpp index e617b3f7..27b29fdf 100644 --- a/cplusplus/VImage.cpp +++ b/cplusplus/VImage.cpp @@ -982,29 +982,29 @@ operator<( VImage a, VImage b ) VImage operator<( double a, VImage b ) { - return( b.relational_const( to_vector( a ), - VIPS_OPERATION_RELATIONAL_MORE ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_MORE, + to_vector( a ) ) ); } VImage operator<( VImage a, double b ) { - return( a.relational_const( to_vector( b ), - VIPS_OPERATION_RELATIONAL_LESS ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_LESS, + to_vector( b ) ) ); } VImage operator<( std::vector a, VImage b ) { - return( b.relational_const( a, - VIPS_OPERATION_RELATIONAL_MORE ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_MORE, + a ) ); } VImage operator<( VImage a, std::vector b ) { - return( a.relational_const( b, - VIPS_OPERATION_RELATIONAL_LESS ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_LESS, + b ) ); } VImage @@ -1016,29 +1016,29 @@ operator<=( VImage a, VImage b ) VImage operator<=( double a, VImage b ) { - return( b.relational_const( to_vector( a ), - VIPS_OPERATION_RELATIONAL_MOREEQ ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_MOREEQ, + to_vector( a ) ) ); } VImage operator<=( VImage a, double b ) { - return( a.relational_const( to_vector( b ), - VIPS_OPERATION_RELATIONAL_LESSEQ ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_LESSEQ, + to_vector( b ) ) ); } VImage operator<=( std::vector a, VImage b ) { - return( b.relational_const( a, - VIPS_OPERATION_RELATIONAL_MOREEQ ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_MOREEQ, + a ) ); } VImage operator<=( VImage a, std::vector b ) { - return( a.relational_const( b, - VIPS_OPERATION_RELATIONAL_LESSEQ ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_LESSEQ, + b ) ); } VImage @@ -1050,29 +1050,29 @@ operator>( VImage a, VImage b ) VImage operator>( double a, VImage b ) { - return( b.relational_const( to_vector( a ), - VIPS_OPERATION_RELATIONAL_LESS ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_LESS, + to_vector( a ) ) ); } VImage operator>( VImage a, double b ) { - return( a.relational_const( to_vector( b ), - VIPS_OPERATION_RELATIONAL_MORE ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_MORE, + to_vector( b ) ) ); } VImage operator>( std::vector a, VImage b ) { - return( b.relational_const( a, - VIPS_OPERATION_RELATIONAL_LESS ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_LESS, + a ) ); } VImage operator>( VImage a, std::vector b ) { - return( a.relational_const( b, - VIPS_OPERATION_RELATIONAL_MORE ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_MORE, + b ) ); } VImage @@ -1084,29 +1084,29 @@ operator>=( VImage a, VImage b ) VImage operator>=( double a, VImage b ) { - return( b.relational_const( to_vector( a ), - VIPS_OPERATION_RELATIONAL_LESSEQ ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_LESSEQ, + to_vector( a ) ) ); } VImage operator>=( VImage a, double b ) { - return( a.relational_const( to_vector( b ), - VIPS_OPERATION_RELATIONAL_MOREEQ ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_MOREEQ, + to_vector( b ) ) ); } VImage operator>=( std::vector a, VImage b ) { - return( b.relational_const( a, - VIPS_OPERATION_RELATIONAL_LESSEQ ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_LESSEQ, + a ) ); } VImage operator>=( VImage a, std::vector b ) { - return( a.relational_const( b, - VIPS_OPERATION_RELATIONAL_MOREEQ ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_MOREEQ, + b ) ); } VImage @@ -1118,29 +1118,29 @@ operator==( VImage a, VImage b ) VImage operator==( double a, VImage b ) { - return( b.relational_const( to_vector( a ), - VIPS_OPERATION_RELATIONAL_EQUAL ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_EQUAL, + to_vector( a ) ) ); } VImage operator==( VImage a, double b ) { - return( a.relational_const( to_vector( b ), - VIPS_OPERATION_RELATIONAL_EQUAL ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_EQUAL, + to_vector( b ) ) ); } VImage operator==( std::vector a, VImage b ) { - return( b.relational_const( a, - VIPS_OPERATION_RELATIONAL_EQUAL ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_EQUAL, + a ) ); } VImage operator==( VImage a, std::vector b ) { - return( a.relational_const( b, - VIPS_OPERATION_RELATIONAL_EQUAL ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_EQUAL, + b ) ); } VImage @@ -1152,29 +1152,29 @@ operator!=( VImage a, VImage b ) VImage operator!=( double a, VImage b ) { - return( b.relational_const( to_vector( a ), - VIPS_OPERATION_RELATIONAL_NOTEQ ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_NOTEQ, + to_vector( a ) ) ); } VImage operator!=( VImage a, double b ) { - return( a.relational_const( to_vector( b ), - VIPS_OPERATION_RELATIONAL_NOTEQ ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_NOTEQ, + to_vector( b ) ) ); } VImage operator!=( std::vector a, VImage b ) { - return( b.relational_const( a, - VIPS_OPERATION_RELATIONAL_NOTEQ ) ); + return( b.relational_const( VIPS_OPERATION_RELATIONAL_NOTEQ, + a ) ); } VImage operator!=( VImage a, std::vector b ) { - return( a.relational_const( b, - VIPS_OPERATION_RELATIONAL_NOTEQ ) ); + return( a.relational_const( VIPS_OPERATION_RELATIONAL_NOTEQ, + b ) ); } VImage @@ -1186,27 +1186,27 @@ operator&( VImage a, VImage b ) VImage operator&( double a, VImage b ) { - return( b.boolean_const( to_vector( a ), - VIPS_OPERATION_BOOLEAN_AND ) ); + return( b.boolean_const( VIPS_OPERATION_BOOLEAN_AND, + to_vector( a ) ) ); } VImage operator&( VImage a, double b ) { - return( a.boolean_const( to_vector( b ), - VIPS_OPERATION_BOOLEAN_AND ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_AND, + to_vector( b ) ) ); } VImage operator&( std::vector a, VImage b ) { - return( b.boolean_const( a, VIPS_OPERATION_BOOLEAN_AND ) ); + return( b.boolean_const( VIPS_OPERATION_BOOLEAN_AND, a ) ); } VImage operator&( VImage a, std::vector b ) { - return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_AND ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_AND, b ) ); } VImage & @@ -1236,27 +1236,29 @@ operator|( VImage a, VImage b ) VImage operator|( double a, VImage b ) { - return( b.boolean_const( to_vector( a ), - VIPS_OPERATION_BOOLEAN_OR ) ); + return( b.boolean_const( VIPS_OPERATION_BOOLEAN_OR, + to_vector( a ) ) ); } VImage operator|( VImage a, double b ) { - return( a.boolean_const( to_vector( b ), - VIPS_OPERATION_BOOLEAN_OR ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_OR, + to_vector( b ) ) ); } VImage operator|( std::vector a, VImage b ) { - return( b.boolean_const( a, VIPS_OPERATION_BOOLEAN_OR ) ); + return( b.boolean_const( VIPS_OPERATION_BOOLEAN_OR, + a ) ); } VImage operator|( VImage a, std::vector b ) { - return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_OR ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_OR, + b ) ); } VImage & @@ -1286,27 +1288,29 @@ operator^( VImage a, VImage b ) VImage operator^( double a, VImage b ) { - return( b.boolean_const( to_vector( a ), - VIPS_OPERATION_BOOLEAN_EOR ) ); + return( b.boolean_const( VIPS_OPERATION_BOOLEAN_EOR, + to_vector( a ) ) ); } VImage operator^( VImage a, double b ) { - return( a.boolean_const( to_vector( b ), - VIPS_OPERATION_BOOLEAN_EOR ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_EOR, + to_vector( b ) ) ); } VImage operator^( std::vector a, VImage b ) { - return( b.boolean_const( a, VIPS_OPERATION_BOOLEAN_EOR ) ); + return( b.boolean_const( VIPS_OPERATION_BOOLEAN_EOR, + a ) ); } VImage operator^( VImage a, std::vector b ) { - return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_EOR ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_EOR, + b ) ); } VImage & @@ -1336,14 +1340,15 @@ operator<<( VImage a, VImage b ) VImage operator<<( VImage a, double b ) { - return( a.boolean_const( to_vector( b ), - VIPS_OPERATION_BOOLEAN_LSHIFT ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_LSHIFT, + to_vector( b ) ) ); } VImage operator<<( VImage a, std::vector b ) { - return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_LSHIFT ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_LSHIFT, + b ) ); } VImage & @@ -1373,14 +1378,15 @@ operator>>( VImage a, VImage b ) VImage operator>>( VImage a, double b ) { - return( a.boolean_const( to_vector( b ), - VIPS_OPERATION_BOOLEAN_RSHIFT ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_RSHIFT, + to_vector( b ) ) ); } VImage operator>>( VImage a, std::vector b ) { - return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_RSHIFT ) ); + return( a.boolean_const( VIPS_OPERATION_BOOLEAN_RSHIFT, + b ) ); } VImage & diff --git a/cplusplus/include/vips/VImage8.h b/cplusplus/include/vips/VImage8.h index 00d05896..b23a76d8 100644 --- a/cplusplus/include/vips/VImage8.h +++ b/cplusplus/include/vips/VImage8.h @@ -699,15 +699,15 @@ public: VImage pow( double other, VOption *options = 0 ) { - return( math2_const( to_vector( other ), - VIPS_OPERATION_MATH2_POW, options ) ); + return( math2_const( VIPS_OPERATION_MATH2_POW, + to_vector( other ), options ) ); } VImage pow( std::vector other, VOption *options = 0 ) { - return( math2_const( other, - VIPS_OPERATION_MATH2_POW, options ) ); + return( math2_const( VIPS_OPERATION_MATH2_POW, + other, options ) ); } VImage @@ -719,15 +719,15 @@ public: VImage wop( double other, VOption *options = 0 ) { - return( math2_const( to_vector( other ), - VIPS_OPERATION_MATH2_WOP, options ) ); + return( math2_const( VIPS_OPERATION_MATH2_WOP, + to_vector( other ), options ) ); } VImage wop( std::vector other, VOption *options = 0 ) { - return( math2_const( other, - VIPS_OPERATION_MATH2_WOP, options ) ); + return( math2_const( VIPS_OPERATION_MATH2_WOP, + other, options ) ); } VImage diff --git a/cplusplus/include/vips/vips-operators.h b/cplusplus/include/vips/vips-operators.h index 0caa7ff6..c47bb8ba 100644 --- a/cplusplus/include/vips/vips-operators.h +++ b/cplusplus/include/vips/vips-operators.h @@ -1,5 +1,5 @@ // headers for vips operations -// Wed 2 Nov 13:48:15 GMT 2016 +// Mon 13 Mar 13:22:09 GMT 2017 // this file is generated automatically, do not edit! static void system( char * cmd_format , VOption *options = 0 ); @@ -20,10 +20,10 @@ VImage math( VipsOperationMath math , VOption *options = 0 ); VImage abs( VOption *options = 0 ); VImage sign( VOption *options = 0 ); VImage round( VipsOperationRound round , VOption *options = 0 ); -VImage relational_const( std::vector c , VipsOperationRelational relational , VOption *options = 0 ); +VImage relational_const( VipsOperationRelational relational , std::vector c , VOption *options = 0 ); VImage remainder_const( std::vector c , VOption *options = 0 ); -VImage boolean_const( std::vector c , VipsOperationBoolean boolean , VOption *options = 0 ); -VImage math2_const( std::vector c , VipsOperationMath2 math2 , VOption *options = 0 ); +VImage boolean_const( VipsOperationBoolean boolean , std::vector c , VOption *options = 0 ); +VImage math2_const( VipsOperationMath2 math2 , std::vector c , VOption *options = 0 ); VImage complex( VipsOperationComplex cmplx , VOption *options = 0 ); VImage complexget( VipsOperationComplexget get , VOption *options = 0 ); double avg( VOption *options = 0 ); diff --git a/cplusplus/vips-operators.cpp b/cplusplus/vips-operators.cpp index c32b53a0..5e2f0507 100644 --- a/cplusplus/vips-operators.cpp +++ b/cplusplus/vips-operators.cpp @@ -1,5 +1,5 @@ // bodies for vips operations -// Wed 2 Nov 13:48:04 GMT 2016 +// Mon 13 Mar 13:22:17 GMT 2017 // this file is generated automatically, do not edit! void VImage::system( char * cmd_format , VOption *options ) @@ -231,7 +231,7 @@ VImage VImage::round( VipsOperationRound round , VOption *options ) return( out ); } -VImage VImage::relational_const( std::vector c , VipsOperationRelational relational , VOption *options ) +VImage VImage::relational_const( VipsOperationRelational relational , std::vector c , VOption *options ) { VImage out; @@ -239,8 +239,8 @@ VImage VImage::relational_const( std::vector c , VipsOperationRelational (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "c", c ) -> - set( "relational", relational ) ); + set( "relational", relational ) -> + set( "c", c ) ); return( out ); } @@ -258,7 +258,7 @@ VImage VImage::remainder_const( std::vector c , VOption *options ) return( out ); } -VImage VImage::boolean_const( std::vector c , VipsOperationBoolean boolean , VOption *options ) +VImage VImage::boolean_const( VipsOperationBoolean boolean , std::vector c , VOption *options ) { VImage out; @@ -266,13 +266,13 @@ VImage VImage::boolean_const( std::vector c , VipsOperationBoolean boole (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "c", c ) -> - set( "boolean", boolean ) ); + set( "boolean", boolean ) -> + set( "c", c ) ); return( out ); } -VImage VImage::math2_const( std::vector c , VipsOperationMath2 math2 , VOption *options ) +VImage VImage::math2_const( VipsOperationMath2 math2 , std::vector c , VOption *options ) { VImage out; @@ -280,8 +280,8 @@ VImage VImage::math2_const( std::vector c , VipsOperationMath2 math2 , V (options ? options : VImage::option()) -> set( "in", *this ) -> set( "out", &out ) -> - set( "c", c ) -> - set( "math2", math2 ) ); + set( "math2", math2 ) -> + set( "c", c ) ); return( out ); } @@ -493,8 +493,8 @@ VImage VImage::copy( VOption *options ) call( "copy" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -505,8 +505,8 @@ VImage VImage::tilecache( VOption *options ) call( "tilecache" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -517,8 +517,8 @@ VImage VImage::linecache( VOption *options ) call( "linecache" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -529,8 +529,8 @@ VImage VImage::sequential( VOption *options ) call( "sequential" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -541,8 +541,8 @@ VImage VImage::cache( VOption *options ) call( "cache" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -569,8 +569,8 @@ VImage VImage::flip( VipsDirection direction , VOption *options ) call( "flip" , (options ? options : VImage::option()) -> - set( "out", &out ) -> set( "in", *this ) -> + set( "out", &out ) -> set( "direction", direction ) ); return( out ); @@ -728,8 +728,8 @@ VImage VImage::cast( VipsBandFormat format , VOption *options ) call( "cast" , (options ? options : VImage::option()) -> - set( "out", &out ) -> set( "in", *this ) -> + set( "out", &out ) -> set( "format", format ) ); return( out ); @@ -741,8 +741,8 @@ VImage VImage::rot( VipsAngle angle , VOption *options ) call( "rot" , (options ? options : VImage::option()) -> - set( "out", &out ) -> set( "in", *this ) -> + set( "out", &out ) -> set( "angle", angle ) ); return( out ); @@ -754,8 +754,8 @@ VImage VImage::rot45( VOption *options ) call( "rot45" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -766,8 +766,8 @@ VImage VImage::autorot( VOption *options ) call( "autorot" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -805,8 +805,8 @@ VImage VImage::bandfold( VOption *options ) call( "bandfold" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -817,8 +817,8 @@ VImage VImage::bandunfold( VOption *options ) call( "bandunfold" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -829,8 +829,8 @@ VImage VImage::flatten( VOption *options ) call( "flatten" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -841,8 +841,8 @@ VImage VImage::premultiply( VOption *options ) call( "premultiply" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -853,8 +853,8 @@ VImage VImage::unpremultiply( VOption *options ) call( "unpremultiply" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -865,8 +865,8 @@ VImage VImage::grid( int tile_height , int across , int down , VOption *options call( "grid" , (options ? options : VImage::option()) -> - set( "out", &out ) -> set( "in", *this ) -> + set( "out", &out ) -> set( "tile-height", tile_height ) -> set( "across", across ) -> set( "down", down ) ); @@ -880,8 +880,8 @@ VImage VImage::scale( VOption *options ) call( "scale" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -892,8 +892,8 @@ VImage VImage::wrap( VOption *options ) call( "wrap" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); } @@ -944,8 +944,8 @@ VImage VImage::byteswap( VOption *options ) call( "byteswap" , (options ? options : VImage::option()) -> - set( "out", &out ) -> - set( "in", *this ) ); + set( "in", *this ) -> + set( "out", &out ) ); return( out ); }