update cpp API for arg order changes

hopefully user code won't see this
This commit is contained in:
John Cupitt 2017-03-13 13:28:37 +00:00
parent fc7f9d4941
commit 8062a4b1e6
4 changed files with 134 additions and 128 deletions

View File

@ -982,29 +982,29 @@ operator<( VImage a, VImage b )
VImage VImage
operator<( double a, VImage b ) operator<( double a, VImage b )
{ {
return( b.relational_const( to_vector( a ), return( b.relational_const( VIPS_OPERATION_RELATIONAL_MORE,
VIPS_OPERATION_RELATIONAL_MORE ) ); to_vector( a ) ) );
} }
VImage VImage
operator<( VImage a, double b ) operator<( VImage a, double b )
{ {
return( a.relational_const( to_vector( b ), return( a.relational_const( VIPS_OPERATION_RELATIONAL_LESS,
VIPS_OPERATION_RELATIONAL_LESS ) ); to_vector( b ) ) );
} }
VImage VImage
operator<( std::vector<double> a, VImage b ) operator<( std::vector<double> a, VImage b )
{ {
return( b.relational_const( a, return( b.relational_const( VIPS_OPERATION_RELATIONAL_MORE,
VIPS_OPERATION_RELATIONAL_MORE ) ); a ) );
} }
VImage VImage
operator<( VImage a, std::vector<double> b ) operator<( VImage a, std::vector<double> b )
{ {
return( a.relational_const( b, return( a.relational_const( VIPS_OPERATION_RELATIONAL_LESS,
VIPS_OPERATION_RELATIONAL_LESS ) ); b ) );
} }
VImage VImage
@ -1016,29 +1016,29 @@ operator<=( VImage a, VImage b )
VImage VImage
operator<=( double a, VImage b ) operator<=( double a, VImage b )
{ {
return( b.relational_const( to_vector( a ), return( b.relational_const( VIPS_OPERATION_RELATIONAL_MOREEQ,
VIPS_OPERATION_RELATIONAL_MOREEQ ) ); to_vector( a ) ) );
} }
VImage VImage
operator<=( VImage a, double b ) operator<=( VImage a, double b )
{ {
return( a.relational_const( to_vector( b ), return( a.relational_const( VIPS_OPERATION_RELATIONAL_LESSEQ,
VIPS_OPERATION_RELATIONAL_LESSEQ ) ); to_vector( b ) ) );
} }
VImage VImage
operator<=( std::vector<double> a, VImage b ) operator<=( std::vector<double> a, VImage b )
{ {
return( b.relational_const( a, return( b.relational_const( VIPS_OPERATION_RELATIONAL_MOREEQ,
VIPS_OPERATION_RELATIONAL_MOREEQ ) ); a ) );
} }
VImage VImage
operator<=( VImage a, std::vector<double> b ) operator<=( VImage a, std::vector<double> b )
{ {
return( a.relational_const( b, return( a.relational_const( VIPS_OPERATION_RELATIONAL_LESSEQ,
VIPS_OPERATION_RELATIONAL_LESSEQ ) ); b ) );
} }
VImage VImage
@ -1050,29 +1050,29 @@ operator>( VImage a, VImage b )
VImage VImage
operator>( double a, VImage b ) operator>( double a, VImage b )
{ {
return( b.relational_const( to_vector( a ), return( b.relational_const( VIPS_OPERATION_RELATIONAL_LESS,
VIPS_OPERATION_RELATIONAL_LESS ) ); to_vector( a ) ) );
} }
VImage VImage
operator>( VImage a, double b ) operator>( VImage a, double b )
{ {
return( a.relational_const( to_vector( b ), return( a.relational_const( VIPS_OPERATION_RELATIONAL_MORE,
VIPS_OPERATION_RELATIONAL_MORE ) ); to_vector( b ) ) );
} }
VImage VImage
operator>( std::vector<double> a, VImage b ) operator>( std::vector<double> a, VImage b )
{ {
return( b.relational_const( a, return( b.relational_const( VIPS_OPERATION_RELATIONAL_LESS,
VIPS_OPERATION_RELATIONAL_LESS ) ); a ) );
} }
VImage VImage
operator>( VImage a, std::vector<double> b ) operator>( VImage a, std::vector<double> b )
{ {
return( a.relational_const( b, return( a.relational_const( VIPS_OPERATION_RELATIONAL_MORE,
VIPS_OPERATION_RELATIONAL_MORE ) ); b ) );
} }
VImage VImage
@ -1084,29 +1084,29 @@ operator>=( VImage a, VImage b )
VImage VImage
operator>=( double a, VImage b ) operator>=( double a, VImage b )
{ {
return( b.relational_const( to_vector( a ), return( b.relational_const( VIPS_OPERATION_RELATIONAL_LESSEQ,
VIPS_OPERATION_RELATIONAL_LESSEQ ) ); to_vector( a ) ) );
} }
VImage VImage
operator>=( VImage a, double b ) operator>=( VImage a, double b )
{ {
return( a.relational_const( to_vector( b ), return( a.relational_const( VIPS_OPERATION_RELATIONAL_MOREEQ,
VIPS_OPERATION_RELATIONAL_MOREEQ ) ); to_vector( b ) ) );
} }
VImage VImage
operator>=( std::vector<double> a, VImage b ) operator>=( std::vector<double> a, VImage b )
{ {
return( b.relational_const( a, return( b.relational_const( VIPS_OPERATION_RELATIONAL_LESSEQ,
VIPS_OPERATION_RELATIONAL_LESSEQ ) ); a ) );
} }
VImage VImage
operator>=( VImage a, std::vector<double> b ) operator>=( VImage a, std::vector<double> b )
{ {
return( a.relational_const( b, return( a.relational_const( VIPS_OPERATION_RELATIONAL_MOREEQ,
VIPS_OPERATION_RELATIONAL_MOREEQ ) ); b ) );
} }
VImage VImage
@ -1118,29 +1118,29 @@ operator==( VImage a, VImage b )
VImage VImage
operator==( double a, VImage b ) operator==( double a, VImage b )
{ {
return( b.relational_const( to_vector( a ), return( b.relational_const( VIPS_OPERATION_RELATIONAL_EQUAL,
VIPS_OPERATION_RELATIONAL_EQUAL ) ); to_vector( a ) ) );
} }
VImage VImage
operator==( VImage a, double b ) operator==( VImage a, double b )
{ {
return( a.relational_const( to_vector( b ), return( a.relational_const( VIPS_OPERATION_RELATIONAL_EQUAL,
VIPS_OPERATION_RELATIONAL_EQUAL ) ); to_vector( b ) ) );
} }
VImage VImage
operator==( std::vector<double> a, VImage b ) operator==( std::vector<double> a, VImage b )
{ {
return( b.relational_const( a, return( b.relational_const( VIPS_OPERATION_RELATIONAL_EQUAL,
VIPS_OPERATION_RELATIONAL_EQUAL ) ); a ) );
} }
VImage VImage
operator==( VImage a, std::vector<double> b ) operator==( VImage a, std::vector<double> b )
{ {
return( a.relational_const( b, return( a.relational_const( VIPS_OPERATION_RELATIONAL_EQUAL,
VIPS_OPERATION_RELATIONAL_EQUAL ) ); b ) );
} }
VImage VImage
@ -1152,29 +1152,29 @@ operator!=( VImage a, VImage b )
VImage VImage
operator!=( double a, VImage b ) operator!=( double a, VImage b )
{ {
return( b.relational_const( to_vector( a ), return( b.relational_const( VIPS_OPERATION_RELATIONAL_NOTEQ,
VIPS_OPERATION_RELATIONAL_NOTEQ ) ); to_vector( a ) ) );
} }
VImage VImage
operator!=( VImage a, double b ) operator!=( VImage a, double b )
{ {
return( a.relational_const( to_vector( b ), return( a.relational_const( VIPS_OPERATION_RELATIONAL_NOTEQ,
VIPS_OPERATION_RELATIONAL_NOTEQ ) ); to_vector( b ) ) );
} }
VImage VImage
operator!=( std::vector<double> a, VImage b ) operator!=( std::vector<double> a, VImage b )
{ {
return( b.relational_const( a, return( b.relational_const( VIPS_OPERATION_RELATIONAL_NOTEQ,
VIPS_OPERATION_RELATIONAL_NOTEQ ) ); a ) );
} }
VImage VImage
operator!=( VImage a, std::vector<double> b ) operator!=( VImage a, std::vector<double> b )
{ {
return( a.relational_const( b, return( a.relational_const( VIPS_OPERATION_RELATIONAL_NOTEQ,
VIPS_OPERATION_RELATIONAL_NOTEQ ) ); b ) );
} }
VImage VImage
@ -1186,27 +1186,27 @@ operator&( VImage a, VImage b )
VImage VImage
operator&( double a, VImage b ) operator&( double a, VImage b )
{ {
return( b.boolean_const( to_vector( a ), return( b.boolean_const( VIPS_OPERATION_BOOLEAN_AND,
VIPS_OPERATION_BOOLEAN_AND ) ); to_vector( a ) ) );
} }
VImage VImage
operator&( VImage a, double b ) operator&( VImage a, double b )
{ {
return( a.boolean_const( to_vector( b ), return( a.boolean_const( VIPS_OPERATION_BOOLEAN_AND,
VIPS_OPERATION_BOOLEAN_AND ) ); to_vector( b ) ) );
} }
VImage VImage
operator&( std::vector<double> a, VImage b ) operator&( std::vector<double> a, VImage b )
{ {
return( b.boolean_const( a, VIPS_OPERATION_BOOLEAN_AND ) ); return( b.boolean_const( VIPS_OPERATION_BOOLEAN_AND, a ) );
} }
VImage VImage
operator&( VImage a, std::vector<double> b ) operator&( VImage a, std::vector<double> b )
{ {
return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_AND ) ); return( a.boolean_const( VIPS_OPERATION_BOOLEAN_AND, b ) );
} }
VImage & VImage &
@ -1236,27 +1236,29 @@ operator|( VImage a, VImage b )
VImage VImage
operator|( double a, VImage b ) operator|( double a, VImage b )
{ {
return( b.boolean_const( to_vector( a ), return( b.boolean_const( VIPS_OPERATION_BOOLEAN_OR,
VIPS_OPERATION_BOOLEAN_OR ) ); to_vector( a ) ) );
} }
VImage VImage
operator|( VImage a, double b ) operator|( VImage a, double b )
{ {
return( a.boolean_const( to_vector( b ), return( a.boolean_const( VIPS_OPERATION_BOOLEAN_OR,
VIPS_OPERATION_BOOLEAN_OR ) ); to_vector( b ) ) );
} }
VImage VImage
operator|( std::vector<double> a, VImage b ) operator|( std::vector<double> a, VImage b )
{ {
return( b.boolean_const( a, VIPS_OPERATION_BOOLEAN_OR ) ); return( b.boolean_const( VIPS_OPERATION_BOOLEAN_OR,
a ) );
} }
VImage VImage
operator|( VImage a, std::vector<double> b ) operator|( VImage a, std::vector<double> b )
{ {
return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_OR ) ); return( a.boolean_const( VIPS_OPERATION_BOOLEAN_OR,
b ) );
} }
VImage & VImage &
@ -1286,27 +1288,29 @@ operator^( VImage a, VImage b )
VImage VImage
operator^( double a, VImage b ) operator^( double a, VImage b )
{ {
return( b.boolean_const( to_vector( a ), return( b.boolean_const( VIPS_OPERATION_BOOLEAN_EOR,
VIPS_OPERATION_BOOLEAN_EOR ) ); to_vector( a ) ) );
} }
VImage VImage
operator^( VImage a, double b ) operator^( VImage a, double b )
{ {
return( a.boolean_const( to_vector( b ), return( a.boolean_const( VIPS_OPERATION_BOOLEAN_EOR,
VIPS_OPERATION_BOOLEAN_EOR ) ); to_vector( b ) ) );
} }
VImage VImage
operator^( std::vector<double> a, VImage b ) operator^( std::vector<double> a, VImage b )
{ {
return( b.boolean_const( a, VIPS_OPERATION_BOOLEAN_EOR ) ); return( b.boolean_const( VIPS_OPERATION_BOOLEAN_EOR,
a ) );
} }
VImage VImage
operator^( VImage a, std::vector<double> b ) operator^( VImage a, std::vector<double> b )
{ {
return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_EOR ) ); return( a.boolean_const( VIPS_OPERATION_BOOLEAN_EOR,
b ) );
} }
VImage & VImage &
@ -1336,14 +1340,15 @@ operator<<( VImage a, VImage b )
VImage VImage
operator<<( VImage a, double b ) operator<<( VImage a, double b )
{ {
return( a.boolean_const( to_vector( b ), return( a.boolean_const( VIPS_OPERATION_BOOLEAN_LSHIFT,
VIPS_OPERATION_BOOLEAN_LSHIFT ) ); to_vector( b ) ) );
} }
VImage VImage
operator<<( VImage a, std::vector<double> b ) operator<<( VImage a, std::vector<double> b )
{ {
return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_LSHIFT ) ); return( a.boolean_const( VIPS_OPERATION_BOOLEAN_LSHIFT,
b ) );
} }
VImage & VImage &
@ -1373,14 +1378,15 @@ operator>>( VImage a, VImage b )
VImage VImage
operator>>( VImage a, double b ) operator>>( VImage a, double b )
{ {
return( a.boolean_const( to_vector( b ), return( a.boolean_const( VIPS_OPERATION_BOOLEAN_RSHIFT,
VIPS_OPERATION_BOOLEAN_RSHIFT ) ); to_vector( b ) ) );
} }
VImage VImage
operator>>( VImage a, std::vector<double> b ) operator>>( VImage a, std::vector<double> b )
{ {
return( a.boolean_const( b, VIPS_OPERATION_BOOLEAN_RSHIFT ) ); return( a.boolean_const( VIPS_OPERATION_BOOLEAN_RSHIFT,
b ) );
} }
VImage & VImage &

View File

@ -699,15 +699,15 @@ public:
VImage VImage
pow( double other, VOption *options = 0 ) pow( double other, VOption *options = 0 )
{ {
return( math2_const( to_vector( other ), return( math2_const( VIPS_OPERATION_MATH2_POW,
VIPS_OPERATION_MATH2_POW, options ) ); to_vector( other ), options ) );
} }
VImage VImage
pow( std::vector<double> other, VOption *options = 0 ) pow( std::vector<double> other, VOption *options = 0 )
{ {
return( math2_const( other, return( math2_const( VIPS_OPERATION_MATH2_POW,
VIPS_OPERATION_MATH2_POW, options ) ); other, options ) );
} }
VImage VImage
@ -719,15 +719,15 @@ public:
VImage VImage
wop( double other, VOption *options = 0 ) wop( double other, VOption *options = 0 )
{ {
return( math2_const( to_vector( other ), return( math2_const( VIPS_OPERATION_MATH2_WOP,
VIPS_OPERATION_MATH2_WOP, options ) ); to_vector( other ), options ) );
} }
VImage VImage
wop( std::vector<double> other, VOption *options = 0 ) wop( std::vector<double> other, VOption *options = 0 )
{ {
return( math2_const( other, return( math2_const( VIPS_OPERATION_MATH2_WOP,
VIPS_OPERATION_MATH2_WOP, options ) ); other, options ) );
} }
VImage VImage

View File

@ -1,5 +1,5 @@
// headers for vips operations // 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! // this file is generated automatically, do not edit!
static void system( char * cmd_format , VOption *options = 0 ); 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 abs( VOption *options = 0 );
VImage sign( VOption *options = 0 ); VImage sign( VOption *options = 0 );
VImage round( VipsOperationRound round , VOption *options = 0 ); VImage round( VipsOperationRound round , VOption *options = 0 );
VImage relational_const( std::vector<double> c , VipsOperationRelational relational , VOption *options = 0 ); VImage relational_const( VipsOperationRelational relational , std::vector<double> c , VOption *options = 0 );
VImage remainder_const( std::vector<double> c , VOption *options = 0 ); VImage remainder_const( std::vector<double> c , VOption *options = 0 );
VImage boolean_const( std::vector<double> c , VipsOperationBoolean boolean , VOption *options = 0 ); VImage boolean_const( VipsOperationBoolean boolean , std::vector<double> c , VOption *options = 0 );
VImage math2_const( std::vector<double> c , VipsOperationMath2 math2 , VOption *options = 0 ); VImage math2_const( VipsOperationMath2 math2 , std::vector<double> c , VOption *options = 0 );
VImage complex( VipsOperationComplex cmplx , VOption *options = 0 ); VImage complex( VipsOperationComplex cmplx , VOption *options = 0 );
VImage complexget( VipsOperationComplexget get , VOption *options = 0 ); VImage complexget( VipsOperationComplexget get , VOption *options = 0 );
double avg( VOption *options = 0 ); double avg( VOption *options = 0 );

View File

@ -1,5 +1,5 @@
// bodies for vips operations // 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! // this file is generated automatically, do not edit!
void VImage::system( char * cmd_format , VOption *options ) void VImage::system( char * cmd_format , VOption *options )
@ -231,7 +231,7 @@ VImage VImage::round( VipsOperationRound round , VOption *options )
return( out ); return( out );
} }
VImage VImage::relational_const( std::vector<double> c , VipsOperationRelational relational , VOption *options ) VImage VImage::relational_const( VipsOperationRelational relational , std::vector<double> c , VOption *options )
{ {
VImage out; VImage out;
@ -239,8 +239,8 @@ VImage VImage::relational_const( std::vector<double> c , VipsOperationRelational
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "in", *this ) -> set( "in", *this ) ->
set( "out", &out ) -> set( "out", &out ) ->
set( "c", c ) -> set( "relational", relational ) ->
set( "relational", relational ) ); set( "c", c ) );
return( out ); return( out );
} }
@ -258,7 +258,7 @@ VImage VImage::remainder_const( std::vector<double> c , VOption *options )
return( out ); return( out );
} }
VImage VImage::boolean_const( std::vector<double> c , VipsOperationBoolean boolean , VOption *options ) VImage VImage::boolean_const( VipsOperationBoolean boolean , std::vector<double> c , VOption *options )
{ {
VImage out; VImage out;
@ -266,13 +266,13 @@ VImage VImage::boolean_const( std::vector<double> c , VipsOperationBoolean boole
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "in", *this ) -> set( "in", *this ) ->
set( "out", &out ) -> set( "out", &out ) ->
set( "c", c ) -> set( "boolean", boolean ) ->
set( "boolean", boolean ) ); set( "c", c ) );
return( out ); return( out );
} }
VImage VImage::math2_const( std::vector<double> c , VipsOperationMath2 math2 , VOption *options ) VImage VImage::math2_const( VipsOperationMath2 math2 , std::vector<double> c , VOption *options )
{ {
VImage out; VImage out;
@ -280,8 +280,8 @@ VImage VImage::math2_const( std::vector<double> c , VipsOperationMath2 math2 , V
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "in", *this ) -> set( "in", *this ) ->
set( "out", &out ) -> set( "out", &out ) ->
set( "c", c ) -> set( "math2", math2 ) ->
set( "math2", math2 ) ); set( "c", c ) );
return( out ); return( out );
} }
@ -493,8 +493,8 @@ VImage VImage::copy( VOption *options )
call( "copy" , call( "copy" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -505,8 +505,8 @@ VImage VImage::tilecache( VOption *options )
call( "tilecache" , call( "tilecache" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -517,8 +517,8 @@ VImage VImage::linecache( VOption *options )
call( "linecache" , call( "linecache" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -529,8 +529,8 @@ VImage VImage::sequential( VOption *options )
call( "sequential" , call( "sequential" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -541,8 +541,8 @@ VImage VImage::cache( VOption *options )
call( "cache" , call( "cache" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -569,8 +569,8 @@ VImage VImage::flip( VipsDirection direction , VOption *options )
call( "flip" , call( "flip" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) ->
set( "in", *this ) -> set( "in", *this ) ->
set( "out", &out ) ->
set( "direction", direction ) ); set( "direction", direction ) );
return( out ); return( out );
@ -728,8 +728,8 @@ VImage VImage::cast( VipsBandFormat format , VOption *options )
call( "cast" , call( "cast" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) ->
set( "in", *this ) -> set( "in", *this ) ->
set( "out", &out ) ->
set( "format", format ) ); set( "format", format ) );
return( out ); return( out );
@ -741,8 +741,8 @@ VImage VImage::rot( VipsAngle angle , VOption *options )
call( "rot" , call( "rot" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) ->
set( "in", *this ) -> set( "in", *this ) ->
set( "out", &out ) ->
set( "angle", angle ) ); set( "angle", angle ) );
return( out ); return( out );
@ -754,8 +754,8 @@ VImage VImage::rot45( VOption *options )
call( "rot45" , call( "rot45" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -766,8 +766,8 @@ VImage VImage::autorot( VOption *options )
call( "autorot" , call( "autorot" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -805,8 +805,8 @@ VImage VImage::bandfold( VOption *options )
call( "bandfold" , call( "bandfold" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -817,8 +817,8 @@ VImage VImage::bandunfold( VOption *options )
call( "bandunfold" , call( "bandunfold" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -829,8 +829,8 @@ VImage VImage::flatten( VOption *options )
call( "flatten" , call( "flatten" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -841,8 +841,8 @@ VImage VImage::premultiply( VOption *options )
call( "premultiply" , call( "premultiply" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -853,8 +853,8 @@ VImage VImage::unpremultiply( VOption *options )
call( "unpremultiply" , call( "unpremultiply" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -865,8 +865,8 @@ VImage VImage::grid( int tile_height , int across , int down , VOption *options
call( "grid" , call( "grid" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) ->
set( "in", *this ) -> set( "in", *this ) ->
set( "out", &out ) ->
set( "tile-height", tile_height ) -> set( "tile-height", tile_height ) ->
set( "across", across ) -> set( "across", across ) ->
set( "down", down ) ); set( "down", down ) );
@ -880,8 +880,8 @@ VImage VImage::scale( VOption *options )
call( "scale" , call( "scale" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -892,8 +892,8 @@ VImage VImage::wrap( VOption *options )
call( "wrap" , call( "wrap" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }
@ -944,8 +944,8 @@ VImage VImage::byteswap( VOption *options )
call( "byteswap" , call( "byteswap" ,
(options ? options : VImage::option()) -> (options ? options : VImage::option()) ->
set( "out", &out ) -> set( "in", *this ) ->
set( "in", *this ) ); set( "out", &out ) );
return( out ); return( out );
} }