sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update cpp interface for stream variable rename

This commit is contained in:
John Cupitt 2019-11-11 09:24:45 +00:00
parent f5a4f41edf
commit b8ea3f8442
4 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17,7 +17,8 @@
- nifti load/save uses double for all floating point metadata - nifti load/save uses double for all floating point metadata
- add vips_error_buffer_copy() - add vips_error_buffer_copy()
- add VipsStream: a universal IO class for loaders and savers - 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] - add @no_strip option to dzsave [kalozka1]
31/8/19 started 8.8.3 31/8/19 started 8.8.3

42
cplusplus/include/vips/vips-operators.h
View File

@ -1,5 +1,5 @@
// headers for vips operations // 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! // this file is generated automatically, do not edit!
/** /**
@ -1067,10 +1067,10 @@ void jpegsave_mime( VOption *options = 0 ) const;
/** /**
* Save image to jpeg stream. * Save image to jpeg stream.
* @param output Stream to save to. * @param streamo Stream to save to.
* @param options Optional options. * @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. * Label regions in an image.
@ -1517,11 +1517,11 @@ static VImage pngload_buffer( VipsBlob *buffer, VOption *options = 0 );
/** /**
* Load png from stream. * Load png from stream.
* @param input Stream to load from. * @param streami Stream to load from.
* @param options Optional options. * @param options Optional options.
* @return Output image. * @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. * Save image to png file.
@ -1539,10 +1539,10 @@ VipsBlob *pngsave_buffer( VOption *options = 0 ) const;
/** /**
* Save image to png stream. * Save image to png stream.
* @param output Stream to save to. * @param streamo Stream to save to.
* @param options Optional options. * @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. * Load ppm from file.
@ -1623,11 +1623,11 @@ static VImage radload_buffer( VipsBlob *buffer, VOption *options = 0 );
/** /**
* Load rad from stream. * Load rad from stream.
* @param input Stream to load from. * @param streami Stream to load from.
* @param options Optional options. * @param options Optional options.
* @return Output image. * @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. * Save image to radiance file.
@ -1645,10 +1645,10 @@ VipsBlob *radsave_buffer( VOption *options = 0 ) const;
/** /**
* Save image to radiance stream. * Save image to radiance stream.
* @param output Stream to save to. * @param streamo Stream to save to.
* @param options Optional options. * @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. * Rank filter.
@ -1994,11 +1994,11 @@ static VImage svgload_buffer( VipsBlob *buffer, VOption *options = 0 );
/** /**
* Load svg from stream. * Load svg from stream.
* @param input Stream to load from. * @param streami Stream to load from.
* @param options Optional options. * @param options Optional options.
* @return Output image. * @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. * 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. * Generate thumbnail from stream.
* @param input Stream to load from. * @param streami Stream to load from.
* @param width Size to this width. * @param width Size to this width.
* @param options Optional options. * @param options Optional options.
* @return Output image. * @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. * Load tiff from file.
@ -2076,11 +2076,11 @@ static VImage tiffload_buffer( VipsBlob *buffer, VOption *options = 0 );
/** /**
* Load tiff from stream. * Load tiff from stream.
* @param input Stream to load from. * @param streami Stream to load from.
* @param options Optional options. * @param options Optional options.
* @return Output image. * @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. * Save image to tiff file.
@ -2157,11 +2157,11 @@ static VImage webpload_buffer( VipsBlob *buffer, VOption *options = 0 );
/** /**
* Load webp from stream. * Load webp from stream.
* @param input Stream to load from. * @param streami Stream to load from.
* @param options Optional options. * @param options Optional options.
* @return Output image. * @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. * Save image to webp file.
@ -2179,10 +2179,10 @@ VipsBlob *webpsave_buffer( VOption *options = 0 ) const;
/** /**
* Save image to webp stream. * Save image to webp stream.
* @param output Stream to save to. * @param streamo Stream to save to.
* @param options Optional options. * @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. * Make a worley noise image.

42
cplusplus/vips-operators.cpp
View File

@ -1,5 +1,5 @@
// bodies for vips operations // 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! // this file is generated automatically, do not edit!
VImage VImage::CMC2LCh( VOption *options ) const VImage VImage::CMC2LCh( VOption *options ) const
@ -1667,12 +1667,12 @@ void VImage::jpegsave_mime( VOption *options ) const
set( "in", *this ) ); 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", call( "jpegsave_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "in", *this )-> set( "in", *this )->
set( "output", output ) ); set( "streamo", streamo ) );
} }
VImage VImage::labelregions( VOption *options ) const VImage VImage::labelregions( VOption *options ) const
@ -2319,14 +2319,14 @@ VImage VImage::pngload_buffer( VipsBlob *buffer, VOption *options )
return( out ); return( out );
} }
VImage VImage::pngload_stream( const VStreamI &input, VOption *options ) VImage VImage::pngload_stream( const VStreamI &streami, VOption *options )
{ {
VImage out; VImage out;
call( "pngload_stream", call( "pngload_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "out", &out )-> set( "out", &out )->
set( "input", input ) ); set( "streami", streami ) );
return( out ); return( out );
} }
@ -2351,12 +2351,12 @@ VipsBlob *VImage::pngsave_buffer( VOption *options ) const
return( buffer ); 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", call( "pngsave_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "in", *this )-> set( "in", *this )->
set( "output", output ) ); set( "streamo", streamo ) );
} }
VImage VImage::ppmload( const char *filename, VOption *options ) VImage VImage::ppmload( const char *filename, VOption *options )
@ -2478,14 +2478,14 @@ VImage VImage::radload_buffer( VipsBlob *buffer, VOption *options )
return( out ); return( out );
} }
VImage VImage::radload_stream( const VStreamI &input, VOption *options ) VImage VImage::radload_stream( const VStreamI &streami, VOption *options )
{ {
VImage out; VImage out;
call( "radload_stream", call( "radload_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "out", &out )-> set( "out", &out )->
set( "input", input ) ); set( "streami", streami ) );
return( out ); return( out );
} }
@ -2510,12 +2510,12 @@ VipsBlob *VImage::radsave_buffer( VOption *options ) const
return( buffer ); 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", call( "radsave_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "in", *this )-> set( "in", *this )->
set( "output", output ) ); set( "streamo", streamo ) );
} }
VImage VImage::rank( int width, int height, int index, VOption *options ) const 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 ); return( out );
} }
VImage VImage::svgload_stream( const VStreamI &input, VOption *options ) VImage VImage::svgload_stream( const VStreamI &streami, VOption *options )
{ {
VImage out; VImage out;
call( "svgload_stream", call( "svgload_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "out", &out )-> set( "out", &out )->
set( "input", input ) ); set( "streami", streami ) );
return( out ); return( out );
} }
@ -3144,14 +3144,14 @@ VImage VImage::thumbnail_image( int width, VOption *options ) const
return( out ); 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; VImage out;
call( "thumbnail_stream", call( "thumbnail_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "out", &out )-> set( "out", &out )->
set( "input", input )-> set( "streami", streami )->
set( "width", width ) ); set( "width", width ) );
return( out ); return( out );
@ -3181,14 +3181,14 @@ VImage VImage::tiffload_buffer( VipsBlob *buffer, VOption *options )
return( out ); return( out );
} }
VImage VImage::tiffload_stream( const VStreamI &input, VOption *options ) VImage VImage::tiffload_stream( const VStreamI &streami, VOption *options )
{ {
VImage out; VImage out;
call( "tiffload_stream", call( "tiffload_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "out", &out )-> set( "out", &out )->
set( "input", input ) ); set( "streami", streami ) );
return( out ); return( out );
} }
@ -3304,14 +3304,14 @@ VImage VImage::webpload_buffer( VipsBlob *buffer, VOption *options )
return( out ); return( out );
} }
VImage VImage::webpload_stream( const VStreamI &input, VOption *options ) VImage VImage::webpload_stream( const VStreamI &streami, VOption *options )
{ {
VImage out; VImage out;
call( "webpload_stream", call( "webpload_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "out", &out )-> set( "out", &out )->
set( "input", input ) ); set( "streami", streami ) );
return( out ); return( out );
} }
@ -3336,12 +3336,12 @@ VipsBlob *VImage::webpsave_buffer( VOption *options ) const
return( buffer ); 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", call( "webpsave_stream",
(options ? options : VImage::option())-> (options ? options : VImage::option())->
set( "in", *this )-> set( "in", *this )->
set( "output", output ) ); set( "streamo", streamo ) );
} }
VImage VImage::worley( int width, int height, VOption *options ) VImage VImage::worley( int width, int height, VOption *options )

4
libvips/foreign/jpegload.c
View File

@ -213,8 +213,8 @@ vips_foreign_load_jpeg_stream_class_init(
load_class->header = vips_foreign_load_jpeg_stream_header; load_class->header = vips_foreign_load_jpeg_stream_header;
load_class->load = vips_foreign_load_jpeg_stream_load; load_class->load = vips_foreign_load_jpeg_stream_load;
VIPS_ARG_OBJECT( class, "input", 1, VIPS_ARG_OBJECT( class, "streami", 1,
_( "Input" ), _( "Streami" ),
_( "Stream to load from" ), _( "Stream to load from" ),
VIPS_ARGUMENT_REQUIRED_INPUT, VIPS_ARGUMENT_REQUIRED_INPUT,
G_STRUCT_OFFSET( VipsForeignLoadJpegStream, streami ), G_STRUCT_OFFSET( VipsForeignLoadJpegStream, streami ),