From b8ea3f84426824f23e8bc3c23cc9737bd5793c63 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 11 Nov 2019 09:24:45 +0000 Subject: [PATCH] update cpp interface for stream variable rename --- ChangeLog | 3 +- cplusplus/include/vips/vips-operators.h | 42 ++++++++++++------------- cplusplus/vips-operators.cpp | 42 ++++++++++++------------- libvips/foreign/jpegload.c | 4 +-- 4 files changed, 46 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95f4e4dc..ba100ac2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,7 +17,8 @@ - nifti load/save uses double for all floating point metadata - add vips_error_buffer_copy() - add VipsStream: a universal IO class for loaders and savers -- jpeg, png, tiff (though not tiffsave), rad and webp use the new IO class +- jpeg, png, tiff (though not tiffsave), rad, svg and webp use the new IO + class - add @no_strip option to dzsave [kalozka1] 31/8/19 started 8.8.3 diff --git a/cplusplus/include/vips/vips-operators.h b/cplusplus/include/vips/vips-operators.h index d473745a..8d8e0618 100644 --- a/cplusplus/include/vips/vips-operators.h +++ b/cplusplus/include/vips/vips-operators.h @@ -1,5 +1,5 @@ // headers for vips operations -// Sun 10 Nov 2019 01:44:17 PM CET +// Mon 11 Nov 09:21:14 GMT 2019 // this file is generated automatically, do not edit! /** @@ -1067,10 +1067,10 @@ void jpegsave_mime( VOption *options = 0 ) const; /** * Save image to jpeg stream. - * @param output Stream to save to. + * @param streamo Stream to save to. * @param options Optional options. */ -void jpegsave_stream( const VStreamO &output, VOption *options = 0 ) const; +void jpegsave_stream( const VStreamO &streamo, VOption *options = 0 ) const; /** * Label regions in an image. @@ -1517,11 +1517,11 @@ static VImage pngload_buffer( VipsBlob *buffer, VOption *options = 0 ); /** * Load png from stream. - * @param input Stream to load from. + * @param streami Stream to load from. * @param options Optional options. * @return Output image. */ -static VImage pngload_stream( const VStreamI &input, VOption *options = 0 ); +static VImage pngload_stream( const VStreamI &streami, VOption *options = 0 ); /** * Save image to png file. @@ -1539,10 +1539,10 @@ VipsBlob *pngsave_buffer( VOption *options = 0 ) const; /** * Save image to png stream. - * @param output Stream to save to. + * @param streamo Stream to save to. * @param options Optional options. */ -void pngsave_stream( const VStreamO &output, VOption *options = 0 ) const; +void pngsave_stream( const VStreamO &streamo, VOption *options = 0 ) const; /** * Load ppm from file. @@ -1623,11 +1623,11 @@ static VImage radload_buffer( VipsBlob *buffer, VOption *options = 0 ); /** * Load rad from stream. - * @param input Stream to load from. + * @param streami Stream to load from. * @param options Optional options. * @return Output image. */ -static VImage radload_stream( const VStreamI &input, VOption *options = 0 ); +static VImage radload_stream( const VStreamI &streami, VOption *options = 0 ); /** * Save image to radiance file. @@ -1645,10 +1645,10 @@ VipsBlob *radsave_buffer( VOption *options = 0 ) const; /** * Save image to radiance stream. - * @param output Stream to save to. + * @param streamo Stream to save to. * @param options Optional options. */ -void radsave_stream( const VStreamO &output, VOption *options = 0 ) const; +void radsave_stream( const VStreamO &streamo, VOption *options = 0 ) const; /** * Rank filter. @@ -1994,11 +1994,11 @@ static VImage svgload_buffer( VipsBlob *buffer, VOption *options = 0 ); /** * Load svg from stream. - * @param input Stream to load from. + * @param streami Stream to load from. * @param options Optional options. * @return Output image. */ -static VImage svgload_stream( const VStreamI &input, VOption *options = 0 ); +static VImage svgload_stream( const VStreamI &streami, VOption *options = 0 ); /** * Find the index of the first non-zero pixel in tests. @@ -2051,12 +2051,12 @@ VImage thumbnail_image( int width, VOption *options = 0 ) const; /** * Generate thumbnail from stream. - * @param input Stream to load from. + * @param streami Stream to load from. * @param width Size to this width. * @param options Optional options. * @return Output image. */ -static VImage thumbnail_stream( const VStreamI &input, int width, VOption *options = 0 ); +static VImage thumbnail_stream( const VStreamI &streami, int width, VOption *options = 0 ); /** * Load tiff from file. @@ -2076,11 +2076,11 @@ static VImage tiffload_buffer( VipsBlob *buffer, VOption *options = 0 ); /** * Load tiff from stream. - * @param input Stream to load from. + * @param streami Stream to load from. * @param options Optional options. * @return Output image. */ -static VImage tiffload_stream( const VStreamI &input, VOption *options = 0 ); +static VImage tiffload_stream( const VStreamI &streami, VOption *options = 0 ); /** * Save image to tiff file. @@ -2157,11 +2157,11 @@ static VImage webpload_buffer( VipsBlob *buffer, VOption *options = 0 ); /** * Load webp from stream. - * @param input Stream to load from. + * @param streami Stream to load from. * @param options Optional options. * @return Output image. */ -static VImage webpload_stream( const VStreamI &input, VOption *options = 0 ); +static VImage webpload_stream( const VStreamI &streami, VOption *options = 0 ); /** * Save image to webp file. @@ -2179,10 +2179,10 @@ VipsBlob *webpsave_buffer( VOption *options = 0 ) const; /** * Save image to webp stream. - * @param output Stream to save to. + * @param streamo Stream to save to. * @param options Optional options. */ -void webpsave_stream( const VStreamO &output, VOption *options = 0 ) const; +void webpsave_stream( const VStreamO &streamo, VOption *options = 0 ) const; /** * Make a worley noise image. diff --git a/cplusplus/vips-operators.cpp b/cplusplus/vips-operators.cpp index f530fcbb..b20e8eeb 100644 --- a/cplusplus/vips-operators.cpp +++ b/cplusplus/vips-operators.cpp @@ -1,5 +1,5 @@ // bodies for vips operations -// Sun 10 Nov 2019 01:44:18 PM CET +// Mon 11 Nov 09:21:02 GMT 2019 // this file is generated automatically, do not edit! VImage VImage::CMC2LCh( VOption *options ) const @@ -1667,12 +1667,12 @@ void VImage::jpegsave_mime( VOption *options ) const set( "in", *this ) ); } -void VImage::jpegsave_stream( const VStreamO &output, VOption *options ) const +void VImage::jpegsave_stream( const VStreamO &streamo, VOption *options ) const { call( "jpegsave_stream", (options ? options : VImage::option())-> set( "in", *this )-> - set( "output", output ) ); + set( "streamo", streamo ) ); } VImage VImage::labelregions( VOption *options ) const @@ -2319,14 +2319,14 @@ VImage VImage::pngload_buffer( VipsBlob *buffer, VOption *options ) return( out ); } -VImage VImage::pngload_stream( const VStreamI &input, VOption *options ) +VImage VImage::pngload_stream( const VStreamI &streami, VOption *options ) { VImage out; call( "pngload_stream", (options ? options : VImage::option())-> set( "out", &out )-> - set( "input", input ) ); + set( "streami", streami ) ); return( out ); } @@ -2351,12 +2351,12 @@ VipsBlob *VImage::pngsave_buffer( VOption *options ) const return( buffer ); } -void VImage::pngsave_stream( const VStreamO &output, VOption *options ) const +void VImage::pngsave_stream( const VStreamO &streamo, VOption *options ) const { call( "pngsave_stream", (options ? options : VImage::option())-> set( "in", *this )-> - set( "output", output ) ); + set( "streamo", streamo ) ); } VImage VImage::ppmload( const char *filename, VOption *options ) @@ -2478,14 +2478,14 @@ VImage VImage::radload_buffer( VipsBlob *buffer, VOption *options ) return( out ); } -VImage VImage::radload_stream( const VStreamI &input, VOption *options ) +VImage VImage::radload_stream( const VStreamI &streami, VOption *options ) { VImage out; call( "radload_stream", (options ? options : VImage::option())-> set( "out", &out )-> - set( "input", input ) ); + set( "streami", streami ) ); return( out ); } @@ -2510,12 +2510,12 @@ VipsBlob *VImage::radsave_buffer( VOption *options ) const return( buffer ); } -void VImage::radsave_stream( const VStreamO &output, VOption *options ) const +void VImage::radsave_stream( const VStreamO &streamo, VOption *options ) const { call( "radsave_stream", (options ? options : VImage::option())-> set( "in", *this )-> - set( "output", output ) ); + set( "streamo", streamo ) ); } VImage VImage::rank( int width, int height, int index, VOption *options ) const @@ -3062,14 +3062,14 @@ VImage VImage::svgload_buffer( VipsBlob *buffer, VOption *options ) return( out ); } -VImage VImage::svgload_stream( const VStreamI &input, VOption *options ) +VImage VImage::svgload_stream( const VStreamI &streami, VOption *options ) { VImage out; call( "svgload_stream", (options ? options : VImage::option())-> set( "out", &out )-> - set( "input", input ) ); + set( "streami", streami ) ); return( out ); } @@ -3144,14 +3144,14 @@ VImage VImage::thumbnail_image( int width, VOption *options ) const return( out ); } -VImage VImage::thumbnail_stream( const VStreamI &input, int width, VOption *options ) +VImage VImage::thumbnail_stream( const VStreamI &streami, int width, VOption *options ) { VImage out; call( "thumbnail_stream", (options ? options : VImage::option())-> set( "out", &out )-> - set( "input", input )-> + set( "streami", streami )-> set( "width", width ) ); return( out ); @@ -3181,14 +3181,14 @@ VImage VImage::tiffload_buffer( VipsBlob *buffer, VOption *options ) return( out ); } -VImage VImage::tiffload_stream( const VStreamI &input, VOption *options ) +VImage VImage::tiffload_stream( const VStreamI &streami, VOption *options ) { VImage out; call( "tiffload_stream", (options ? options : VImage::option())-> set( "out", &out )-> - set( "input", input ) ); + set( "streami", streami ) ); return( out ); } @@ -3304,14 +3304,14 @@ VImage VImage::webpload_buffer( VipsBlob *buffer, VOption *options ) return( out ); } -VImage VImage::webpload_stream( const VStreamI &input, VOption *options ) +VImage VImage::webpload_stream( const VStreamI &streami, VOption *options ) { VImage out; call( "webpload_stream", (options ? options : VImage::option())-> set( "out", &out )-> - set( "input", input ) ); + set( "streami", streami ) ); return( out ); } @@ -3336,12 +3336,12 @@ VipsBlob *VImage::webpsave_buffer( VOption *options ) const return( buffer ); } -void VImage::webpsave_stream( const VStreamO &output, VOption *options ) const +void VImage::webpsave_stream( const VStreamO &streamo, VOption *options ) const { call( "webpsave_stream", (options ? options : VImage::option())-> set( "in", *this )-> - set( "output", output ) ); + set( "streamo", streamo ) ); } VImage VImage::worley( int width, int height, VOption *options ) diff --git a/libvips/foreign/jpegload.c b/libvips/foreign/jpegload.c index 2c2593cb..27d4dba8 100644 --- a/libvips/foreign/jpegload.c +++ b/libvips/foreign/jpegload.c @@ -213,8 +213,8 @@ vips_foreign_load_jpeg_stream_class_init( load_class->header = vips_foreign_load_jpeg_stream_header; load_class->load = vips_foreign_load_jpeg_stream_load; - VIPS_ARG_OBJECT( class, "input", 1, - _( "Input" ), + VIPS_ARG_OBJECT( class, "streami", 1, + _( "Streami" ), _( "Stream to load from" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsForeignLoadJpegStream, streami ),