From b78812f20018eadea7fb3e2774ef267b894b14bb Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Wed, 12 May 2021 11:36:24 +0200 Subject: [PATCH] Update C++ binding and function list --- cplusplus/include/vips/VImage8.h | 116 +++++++++++++++++++++++++++++-- cplusplus/vips-operators.cpp | 66 +++++++++++++++++- doc/function-list.xml | 36 +++++++++- 3 files changed, 208 insertions(+), 10 deletions(-) diff --git a/cplusplus/include/vips/VImage8.h b/cplusplus/include/vips/VImage8.h index 8b3a5236..d048c66b 100644 --- a/cplusplus/include/vips/VImage8.h +++ b/cplusplus/include/vips/VImage8.h @@ -1789,7 +1789,7 @@ public: */ // headers for vips operations -// Wed Apr 21 06:00:31 PM CEST 2021 +// Wed May 12 11:30:00 AM CEST 2021 // this file is generated automatically, do not edit! /** @@ -3409,7 +3409,7 @@ static VImage jp2kload_buffer( VipsBlob *buffer, VOption *options = 0 ); static VImage jp2kload_source( VSource source, VOption *options = 0 ); /** - * Save image in heif format. + * Save image in jpeg2000 format. * * **Optional parameters** * - **tile_width** -- Tile width in pixels, int. @@ -3427,7 +3427,7 @@ static VImage jp2kload_source( VSource source, VOption *options = 0 ); void jp2ksave( const char *filename, VOption *options = 0 ) const; /** - * Save image in heif format. + * Save image in jpeg2000 format. * * **Optional parameters** * - **tile_width** -- Tile width in pixels, int. @@ -3445,7 +3445,7 @@ void jp2ksave( const char *filename, VOption *options = 0 ) const; VipsBlob *jp2ksave_buffer( VOption *options = 0 ) const; /** - * Save image in heif format. + * Save image in jpeg2000 format. * * **Optional parameters** * - **tile_width** -- Tile width in pixels, int. @@ -3607,6 +3607,108 @@ void jpegsave_mime( VOption *options = 0 ) const; */ void jpegsave_target( VTarget target, VOption *options = 0 ) const; +/** + * Load jpeg-xl image. + * + * **Optional parameters** + * - **memory** -- Force open via memory, bool. + * - **access** -- Required access pattern for this file, VipsAccess. + * - **sequential** -- Sequential read only, bool. + * - **fail** -- Fail on first error, bool. + * - **disc** -- Open to disc, bool. + * + * @param filename Filename to load from. + * @param options Set of options. + * @return Output image. + */ +static VImage jxlload( const char *filename, VOption *options = 0 ); + +/** + * Load jpeg-xl image. + * + * **Optional parameters** + * - **memory** -- Force open via memory, bool. + * - **access** -- Required access pattern for this file, VipsAccess. + * - **sequential** -- Sequential read only, bool. + * - **fail** -- Fail on first error, bool. + * - **disc** -- Open to disc, bool. + * + * @param buffer Buffer to load from. + * @param options Set of options. + * @return Output image. + */ +static VImage jxlload_buffer( VipsBlob *buffer, VOption *options = 0 ); + +/** + * Load jpeg-xl image. + * + * **Optional parameters** + * - **memory** -- Force open via memory, bool. + * - **access** -- Required access pattern for this file, VipsAccess. + * - **sequential** -- Sequential read only, bool. + * - **fail** -- Fail on first error, bool. + * - **disc** -- Open to disc, bool. + * + * @param source Source to load from. + * @param options Set of options. + * @return Output image. + */ +static VImage jxlload_source( VSource source, VOption *options = 0 ); + +/** + * Save image in jpeg-xl format. + * + * **Optional parameters** + * - **tier** -- Decode speed tier, int. + * - **distance** -- Target butteraugli distance, double. + * - **effort** -- Encoding effort, int. + * - **lossless** -- Enable lossless compression, bool. + * - **Q** -- Quality factor, int. + * - **strip** -- Strip all metadata from image, bool. + * - **background** -- Background value, std::vector. + * - **page_height** -- Set page height for multipage save, int. + * + * @param filename Filename to load from. + * @param options Set of options. + */ +void jxlsave( const char *filename, VOption *options = 0 ) const; + +/** + * Save image in jpeg-xl format. + * + * **Optional parameters** + * - **tier** -- Decode speed tier, int. + * - **distance** -- Target butteraugli distance, double. + * - **effort** -- Encoding effort, int. + * - **lossless** -- Enable lossless compression, bool. + * - **Q** -- Quality factor, int. + * - **strip** -- Strip all metadata from image, bool. + * - **background** -- Background value, std::vector. + * - **page_height** -- Set page height for multipage save, int. + * + * @param options Set of options. + * @return Buffer to save to. + */ +VipsBlob *jxlsave_buffer( VOption *options = 0 ) const; + +/** + * Save image in jpeg-xl format. + * + * **Optional parameters** + * - **tier** -- Decode speed tier, int. + * - **distance** -- Target butteraugli distance, double. + * - **effort** -- Encoding effort, int. + * - **lossless** -- Enable lossless compression, bool. + * - **Q** -- Quality factor, int. + * - **strip** -- Strip all metadata from image, bool. + * - **background** -- Background value, std::vector. + * - **page_height** -- Set page height for multipage save, int. + * + * @param target Target to save to. + * @param options Set of options. + */ +void jxlsave_target( VTarget target, VOption *options = 0 ) const; + /** * Label regions in an image. * @param options Set of options. @@ -5438,9 +5540,10 @@ static VImage tiffload_source( VSource source, VOption *options = 0 ); * - **properties** -- Write a properties document to IMAGEDESCRIPTION, bool. * - **region_shrink** -- Method to shrink regions, VipsRegionShrink. * - **level** -- ZSTD compression level, int. - * - **subifd** -- Save pyr layers as sub-IFDs, bool. * - **lossless** -- Enable WEBP lossless mode, bool. * - **depth** -- Pyramid depth, VipsForeignDzDepth. + * - **subifd** -- Save pyr layers as sub-IFDs, bool. + * - **premultiply** -- Save with premultiplied alpha, bool. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. * - **page_height** -- Set page height for multipage save, int. @@ -5473,9 +5576,10 @@ void tiffsave( const char *filename, VOption *options = 0 ) const; * - **properties** -- Write a properties document to IMAGEDESCRIPTION, bool. * - **region_shrink** -- Method to shrink regions, VipsRegionShrink. * - **level** -- ZSTD compression level, int. - * - **subifd** -- Save pyr layers as sub-IFDs, bool. * - **lossless** -- Enable WEBP lossless mode, bool. * - **depth** -- Pyramid depth, VipsForeignDzDepth. + * - **subifd** -- Save pyr layers as sub-IFDs, bool. + * - **premultiply** -- Save with premultiplied alpha, bool. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. * - **page_height** -- Set page height for multipage save, int. diff --git a/cplusplus/vips-operators.cpp b/cplusplus/vips-operators.cpp index 88095d1e..7f9a94c0 100644 --- a/cplusplus/vips-operators.cpp +++ b/cplusplus/vips-operators.cpp @@ -1,5 +1,5 @@ // bodies for vips operations -// Wed Apr 21 06:00:31 PM CEST 2021 +// Wed May 12 11:30:00 AM CEST 2021 // this file is generated automatically, do not edit! VImage VImage::CMC2LCh( VOption *options ) const @@ -1803,6 +1803,70 @@ void VImage::jpegsave_target( VTarget target, VOption *options ) const set( "target", target ) ); } +VImage VImage::jxlload( const char *filename, VOption *options ) +{ + VImage out; + + call( "jxlload", + (options ? options : VImage::option())-> + set( "out", &out )-> + set( "filename", filename ) ); + + return( out ); +} + +VImage VImage::jxlload_buffer( VipsBlob *buffer, VOption *options ) +{ + VImage out; + + call( "jxlload_buffer", + (options ? options : VImage::option())-> + set( "out", &out )-> + set( "buffer", buffer ) ); + + return( out ); +} + +VImage VImage::jxlload_source( VSource source, VOption *options ) +{ + VImage out; + + call( "jxlload_source", + (options ? options : VImage::option())-> + set( "out", &out )-> + set( "source", source ) ); + + return( out ); +} + +void VImage::jxlsave( const char *filename, VOption *options ) const +{ + call( "jxlsave", + (options ? options : VImage::option())-> + set( "in", *this )-> + set( "filename", filename ) ); +} + +VipsBlob *VImage::jxlsave_buffer( VOption *options ) const +{ + VipsBlob *buffer; + + call( "jxlsave_buffer", + (options ? options : VImage::option())-> + set( "in", *this )-> + set( "buffer", &buffer ) ); + + return( buffer ); +} + +void VImage::jxlsave_target( VTarget target, VOption *options ) const +{ + call( "jxlsave_target", + (options ? options : VImage::option())-> + set( "in", *this )-> + set( "target", target ) ); +} + VImage VImage::labelregions( VOption *options ) const { VImage mask; diff --git a/doc/function-list.xml b/doc/function-list.xml index 6b4526ad..47474b4f 100644 --- a/doc/function-list.xml +++ b/doc/function-list.xml @@ -758,17 +758,17 @@ jp2ksave - Save image in heif format + Save image in jpeg2000 format vips_jp2ksave() jp2ksave_buffer - Save image in heif format + Save image in jpeg2000 format vips_jp2ksave_buffer() jp2ksave_target - Save image in heif format + Save image in jpeg2000 format vips_jp2ksave_target() @@ -806,6 +806,36 @@ Save image to jpeg target vips_jpegsave_target() + + jxlload + Load jpeg-xl image + vips_jxlload() + + + jxlload_buffer + Load jpeg-xl image + vips_jxlload_buffer() + + + jxlload_source + Load jpeg-xl image + vips_jxlload_source() + + + jxlsave + Save image in jpeg-xl format + vips_jxlsave() + + + jxlsave_buffer + Save image in jpeg-xl format + vips_jxlsave_buffer() + + + jxlsave_target + Save image in jpeg-xl format + vips_jxlsave_target() + labelregions Label regions in an image